Experimental use of crossbeam AtomicCell to achieve different scheduling properties.

Cargo.toml

@@ -4,7 +4,6 @@ cargo-features = ["strip"]
 members = [
   "syndicate",
   "syndicate-macros",
-  "syndicate-schema-plugin",
   "syndicate-server",
   "syndicate-tools",
   ]

Makefile

@@ -32,7 +32,7 @@ pull-protocols:
 static: static-x86_64
 
 static-%:
-	CARGO_TARGET_DIR=target/target.$* cross build --target $*-unknown-linux-musl --features vendored-openssl,jemalloc
+	cross build --target $*-unknown-linux-musl --features vendored-openssl,jemalloc
 
 ###########################################################################
 
@@ -54,18 +54,18 @@ static-%:
 x86_64-binary: x86_64-binary-release
 
 x86_64-binary-release:
-	CARGO_TARGET_DIR=target/target.x86_64 cross build --target x86_64-unknown-linux-musl --release --all-targets --features vendored-openssl,jemalloc
+	cross build --target x86_64-unknown-linux-musl --release --all-targets --features vendored-openssl,jemalloc
 
 x86_64-binary-debug:
-	CARGO_TARGET_DIR=target/target.x86_64 cross build --target x86_64-unknown-linux-musl --all-targets --features vendored-openssl
+	cross build --target x86_64-unknown-linux-musl --all-targets --features vendored-openssl
 
 armv7-binary: armv7-binary-release
 
 armv7-binary-release:
-	CARGO_TARGET_DIR=target/target.armv7 cross build --target=armv7-unknown-linux-musleabihf --release --all-targets --features vendored-openssl
+	cross build --target=armv7-unknown-linux-musleabihf --release --all-targets --features vendored-openssl
 
 armv7-binary-debug:
-	CARGO_TARGET_DIR=target/target.armv7 cross build --target=armv7-unknown-linux-musleabihf --all-targets --features vendored-openssl
+	cross build --target=armv7-unknown-linux-musleabihf --all-targets --features vendored-openssl
 
 # As of 2023-05-12 (and probably earlier!) this is no longer required with current Rust nightlies
 # # Hack to workaround https://github.com/rust-embedded/cross/issues/598
@@ -74,7 +74,7 @@ armv7-binary-debug:
 aarch64-binary: aarch64-binary-release
 
 aarch64-binary-release:
-	CARGO_TARGET_DIR=target/target.aarch64 cross build --target=aarch64-unknown-linux-musl --release --all-targets --features vendored-openssl,jemalloc
+	cross build --target=aarch64-unknown-linux-musl --release --all-targets --features vendored-openssl,jemalloc
 
 aarch64-binary-debug:
-	CARGO_TARGET_DIR=target/target.aarch64 cross build --target=aarch64-unknown-linux-musl --all-targets --features vendored-openssl
+	cross build --target=aarch64-unknown-linux-musl --all-targets --features vendored-openssl

README.md

@@ -44,9 +44,9 @@ Enabling the `jemalloc` feature can get a *substantial* (~20%-50%) improvement i
 
 ## Running the examples
 
-In one window, start the server with a basic configuration:
+In one window, start the server:
 
-    ./target/release/syndicate-server -c dev-scripts/benchmark-config.pr
+    ./target/release/syndicate-server -p 8001
 
 Then, choose one of the examples below.
 
@@ -84,7 +84,7 @@ about who kicks off the pingpong session.
 You may find better performance by restricting the server to fewer
 cores than you have available. For example, for me, running
 
-    taskset -c 0,1 ./target/release/syndicate-server -c dev-scripts/benchmark-config.pr
+    taskset -c 0,1 ./target/release/syndicate-server -p 8001
 
-roughly *doubles* throughput for a single producer/consumer pair,
+roughly *quadruples* throughput for a single producer/consumer pair,
 on my 48-core AMD CPU.

dev-scripts/run-server

@@ -1,7 +1,2 @@
 #!/bin/sh
-TASKSET='taskset -c 0,1'
-if [ $(uname -s) = 'Darwin' ]
-then
-    TASKSET=
-fi
-make -C ../syndicate-server binary && exec $TASKSET ../target/release/syndicate-server -c benchmark-config.pr "$@"
+make -C ../syndicate-server binary && exec taskset -c 0,1 ../target/release/syndicate-server -c benchmark-config.pr "$@"

docker/Dockerfile

@@ -2,5 +2,4 @@ FROM busybox
 RUN mkdir /data
 ARG TARGETARCH
 COPY ./syndicate-server.$TARGETARCH /syndicate-server
-EXPOSE 1
 CMD ["/syndicate-server", "-c", "/data", "-p", "1"]

docker/Makefile

@@ -10,6 +10,7 @@ all:
 
 clean:
 	rm -f syndicate-server.*
+	rm -rf $(patsubst %,target.%,$(ARCHITECTURES))
 	-podman images -q $(U)/$(I) | sort -u | xargs podman rmi -f
 
 image: $(SERVERS)
@@ -33,5 +34,5 @@ push-only:
 	podman manifest push $(U)/$(I):latest
 
 syndicate-server.%:
-	make -C .. $$(./alpine-architecture $*)-binary-release
-	cp -a ../target/target.$$(./alpine-architecture $*)/$$(./alpine-architecture $*)-unknown-linux-musl*/release/syndicate-server $@
+	make -C .. CARGO_TARGET_DIR=docker/target.$* $$(./alpine-architecture $*)-binary-release
+	cp -a target.$*/$$(./alpine-architecture $*)-unknown-linux-musl*/release/syndicate-server $@

gatekeeper-config.pr

@@ -1,152 +0,0 @@
-# We will create a TCP listener on port 9222, which speaks unencrypted
-# protocol and allows interaction with the default/system gatekeeper, which
-# has a single noise binding for introducing encrypted interaction with a
-# *second* gatekeeper, which finally allows resolution of references to
-# other objects.
-
-# First, build a space where we place bindings for the inner gatekeeper to
-# expose.
-let ?inner-bindings = dataspace
-
-# Next, start the inner gatekeeper.
-<require-service <gatekeeper $inner-bindings>>
-? <service-object <gatekeeper $inner-bindings> ?inner-gatekeeper> [
-  # Expose it via a noise binding at the outer/system gatekeeper.
-  <bind <noise { key: #[z1w/OLy0wi3Veyk8/D+2182YxcrKpgc8y0ZJEBDrmWs],
-                 secretKey: #[qLkyuJw/K4yobr4XVKExbinDwEx9QTt9PfDWyx14/kg],
-                 service: world }>
-   $inner-gatekeeper #f>
-]
-
-# Now, expose the outer gatekeeper to the world, via TCP. The system
-# gatekeeper is a primordial syndicate-server object bound to $gatekeeper.
-<require-service <relay-listener <tcp "0.0.0.0" 9222> $gatekeeper>>
-
-# Finally, let's expose some behaviour accessible via the inner gatekeeper.
-#
-# We will create a service dataspace called $world.
-let ?world = dataspace
-
-# Running `syndicate-macaroon mint --oid a-service --phrase hello` yields:
-#
-#     <ref {oid: a-service, sig: #[JTTGQeYCgohMXW/2S2XH8g]}>
-#
-# That's a root capability for the service. We use the corresponding
-# sturdy.SturdyDescriptionDetail to bind it to $world.
-#
-$inner-bindings += <bind <ref {oid: a-service, key: #"hello"}>
-                    $world #f>
-
-# Now, we can hand out paths to our services involving an initial noise
-# step and a subsequent sturdyref/macaroon step.
-#
-# For example, running `syndicate-macaroon` like this:
-#
-#     syndicate-macaroon mint --oid a-service --phrase hello \
-#       --caveat '<rewrite <bind <_>> <rec labelled [<lit "alice"> <ref 0>]>>'
-#
-# generates
-#
-#     <ref {caveats: [<rewrite <bind <_>> <rec labelled [<lit "alice">, <ref 0>]>>],
-#           oid: a-service,
-#           sig: #[CXn7+rAoO3Xr6Y6Laap3OA]}>
-#
-# which is an attenuation of the root capability we bound that wraps all
-# assertions and messages in a `<labelled "alice" _>` wrapper.
-#
-# All together, the `gatekeeper.Route` that Alice would use would be
-# something like:
-#
-#     <route [<ws "wss://generic-dataspace.demo.leastfixedpoint.com/">]
-#      <noise { key: #[z1w/OLy0wi3Veyk8/D+2182YxcrKpgc8y0ZJEBDrmWs],
-#               service: world }>
-#      <ref { caveats: [<rewrite <bind <_>> <rec labelled [<lit "alice">, <ref 0>]>>],
-#             oid: a-service,
-#             sig: #[CXn7+rAoO3Xr6Y6Laap3OA] }>>
-#
-# Here's one for "bob":
-#
-#     syndicate-macaroon mint --oid a-service --phrase hello \
-#       --caveat '<rewrite <bind <_>> <rec labelled [<lit "bob"> <ref 0>]>>'
-#
-#     <ref {caveats: [<rewrite <bind <_>> <rec labelled [<lit "bob">, <ref 0>]>>],
-#           oid: a-service,
-#           sig: #[/75BbF77LOiqNcvpzNHf0g]}>
-#
-#     <route [<ws "wss://generic-dataspace.demo.leastfixedpoint.com/">]
-#      <noise { key: #[z1w/OLy0wi3Veyk8/D+2182YxcrKpgc8y0ZJEBDrmWs],
-#               service: world }>
-#      <ref { caveats: [<rewrite <bind <_>> <rec labelled [<lit "bob">, <ref 0>]>>],
-#             oid: a-service,
-#             sig: #[/75BbF77LOiqNcvpzNHf0g] }>>
-#
-# We relay labelled to unlabelled information, enacting a chat protocol
-# that enforces usernames.
-$world [
-
-  # Assertions of presence have the username wiped out and replaced with the label.
-  ? <labelled ?who <Present _>> <Present $who>
-
-  # Likewise utterance messages.
-  ?? <labelled ?who <Says _ ?what>> ! <Says $who $what>
-
-  # We allow anyone to subscribe to presence and utterances.
-  ? <labelled _ <Observe <rec Present ?p> ?o>> <Observe <rec Present $p> $o>
-  ? <labelled _ <Observe <rec Says ?p> ?o>> <Observe <rec Says $p> $o>
-
-]
-
-# We can also use sturdyref rewrites to directly handle `Says` and
-# `Present` values, rather than wrapping with `<labelled ...>` and
-# unwrapping using the script fragment just above.
-#
-# The multiply-quoted patterns in the `Observe` cases start to get unwieldy
-# at this point!
-#
-# For Alice:
-#
-#     syndicate-macaroon mint --oid a-service --phrase hello --caveat '<or [
-#         <rewrite <rec Present [<_>]> <rec Present [<lit "alice">]>>
-#         <rewrite <rec Says [<_> <bind String>]> <rec Says [<lit "alice"> <ref 0>]>>
-#         <rewrite <bind <rec Observe [<rec rec [<lit Present> <_>]> <_>]>> <ref 0>>
-#         <rewrite <bind <rec Observe [<rec rec [<lit Says> <_>]> <_>]>> <ref 0>>
-#     ]>'
-#
-#     <ref { oid: a-service sig: #[s918Jk6As8AWJ9rtozOTlg] caveats: [<or [
-#       <rewrite <rec Present [<_>]> <rec Present [<lit "alice">]>>
-#       <rewrite <rec Says [<_>, <bind String>]> <rec Says [<lit "alice">, <ref 0>]>>
-#       <rewrite <bind <rec Observe [<rec rec [<lit Present>, <_>]>, <_>]>> <ref 0>>
-#       <rewrite <bind <rec Observe [<rec rec [<lit Says>, <_>]>, <_>]>> <ref 0>> ]>]}>
-#
-#     <route [<ws "wss://generic-dataspace.demo.leastfixedpoint.com/">]
-#      <noise { key: #[z1w/OLy0wi3Veyk8/D+2182YxcrKpgc8y0ZJEBDrmWs],
-#               service: world }>
-#      <ref { oid: a-service sig: #[s918Jk6As8AWJ9rtozOTlg] caveats: [<or [
-#        <rewrite <rec Present [<_>]> <rec Present [<lit "alice">]>>
-#        <rewrite <rec Says [<_>, <bind String>]> <rec Says [<lit "alice">, <ref 0>]>>
-#        <rewrite <bind <rec Observe [<rec rec [<lit Present>, <_>]>, <_>]>> <ref 0>>
-#        <rewrite <bind <rec Observe [<rec rec [<lit Says>, <_>]>, <_>]>> <ref 0>> ]>]}>>
-#
-# For Bob:
-#
-#     syndicate-macaroon mint --oid a-service --phrase hello --caveat '<or [
-#         <rewrite <rec Present [<_>]> <rec Present [<lit "bob">]>>
-#         <rewrite <rec Says [<_> <bind String>]> <rec Says [<lit "bob"> <ref 0>]>>
-#         <rewrite <bind <rec Observe [<rec rec [<lit Present> <_>]> <_>]>> <ref 0>>
-#         <rewrite <bind <rec Observe [<rec rec [<lit Says> <_>]> <_>]>> <ref 0>>
-#     ]>'
-#
-#     <ref { oid: a-service sig: #[QBbV4LrS0i3BG6OyCPJl+A] caveats: [<or [
-#       <rewrite <rec Present [<_>]> <rec Present [<lit "bob">]>>
-#       <rewrite <rec Says [<_>, <bind String>]> <rec Says [<lit "bob">, <ref 0>]>>
-#       <rewrite <bind <rec Observe [<rec rec [<lit Present>, <_>]>, <_>]>> <ref 0>>
-#       <rewrite <bind <rec Observe [<rec rec [<lit Says>, <_>]>, <_>]>> <ref 0>> ]>]}>
-#
-#     <route [<ws "wss://generic-dataspace.demo.leastfixedpoint.com/">]
-#      <noise { key: #[z1w/OLy0wi3Veyk8/D+2182YxcrKpgc8y0ZJEBDrmWs],
-#               service: world }>
-#      <ref { oid: a-service sig: #[QBbV4LrS0i3BG6OyCPJl+A] caveats: [<or [
-#        <rewrite <rec Present [<_>]> <rec Present [<lit "bob">]>>
-#        <rewrite <rec Says [<_>, <bind String>]> <rec Says [<lit "bob">, <ref 0>]>>
-#        <rewrite <bind <rec Observe [<rec rec [<lit Present>, <_>]>, <_>]>> <ref 0>>
-#        <rewrite <bind <rec Observe [<rec rec [<lit Says>, <_>]>, <_>]>> <ref 0>> ]>]}>>

http-config.pr

@@ -1,65 +0,0 @@
-# We use $root_ds as the httpd space.
-let ?root_ds = dataspace
-
-# Supplying $root_ds as the last parameter in this relay-listener enables httpd service.
-<require-service <relay-listener <tcp "0.0.0.0" 9001> $gatekeeper $root_ds>>
-
-# Regular gatekeeper stuff works too.
-<bind <ref { oid: "syndicate" key: #x"" }> $root_ds #f>
-
-# Create an httpd router monitoring $root_ds for requests and bind requests.
-<require-service <http-router $root_ds>>
-
-# Create a static file server. When it gets a request, it ignores the first n (here, 1)
-# elements of the path, and takes the remainder as relative to its configured directory (here,
-# ".").
-#
-<require-service <http-static-files "." 1>>
-#
-# It publishes a service object: requests should be asserted to this.
-# The http-bind record establishes this mapping.
-#
-? <service-object <http-static-files "." 1> ?handler> [
-  $root_ds += <http-bind #f 9001 get ["files" ...] $handler>
-]
-
-# Separately, bind path /d to $index, and respond there.
-#
-let ?index = dataspace
-$root_ds += <http-bind #f 9001 get ["d"] $index>
-$index ? <request _ ?k> [
-  $k ! <status 200 "OK">
-  $k ! <header content-type "text/html">
-  $k ! <chunk "<!DOCTYPE html>">
-  $k ! <done "<html><body>D</body></html>">
-]
-
-# Similarly, bind three paths, /d, /e and /t to $index2
-# Because /d doubles up, the httpd router gives a warning when it is accessed.
-# Accessing /e works fine.
-# Accessing /t results in wasted work because of the hijacking listeners below.
-#
-let ?index2 = dataspace
-$root_ds += <http-bind #f 9001 get ["d"] $index2>
-$root_ds += <http-bind #f 9001 get ["e"] $index2>
-$root_ds += <http-bind #f 9001 get ["t"] $index2>
-$index2 ? <request _ ?k> [
-  $k ! <status 200 "OK">
-  $k ! <header content-type "text/html">
-  $k ! <chunk "<!DOCTYPE html>">
-  $k ! <done "<html><body>D2</body></html>">
-]
-
-# These two hijack /t by listening for raw incoming requests the same way the httpd router
-# does. They respond quicker and so win the race. The httpd router's responses are lost.
-#
-$root_ds ? <request <http-request _ _ _ get ["t"] _ _ _> ?k> [
-  $k ! <status 200 "OK">
-  $k ! <header content-type "text/html">
-  $k ! <done "<html><body>T</body></html>">
-]
-$root_ds ? <request <http-request _ _ _ get ["t"] _ _ _> ?k> [
-  $k ! <status 200 "OK">
-  $k ! <header content-type "text/html">
-  $k ! <done "<html><body>T2</body></html>">
-]

syndicate-macros/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "syndicate-macros"
-version = "0.32.0"
+version = "0.25.0"
 authors = ["Tony Garnock-Jones <tonyg@leastfixedpoint.com>"]
 edition = "2018"
 
@@ -13,7 +13,7 @@ license = "Apache-2.0"
 proc-macro = true
 
 [dependencies]
-syndicate = { path = "../syndicate", version = "0.40.0"}
+syndicate = { path = "../syndicate", version = "0.30.0"}
 
 proc-macro2 = { version = "^1.0", features = ["span-locations"] }
 quote = "^1.0"

syndicate-macros/examples/ring.rs

@@ -5,11 +5,11 @@ use std::sync::Arc;
 #[derive(Debug)]
 enum Instruction {
     SetPeer(Arc<Ref<Instruction>>),
-    HandleMessage(u64),
+    HandleMessage(u32),
 }
 
 struct Forwarder {
-    hop_limit: u64,
+    n_rounds: u32,
     supervisor: Arc<Ref<Instruction>>,
     peer: Option<Arc<Ref<Instruction>>>,
 }
@@ -31,7 +31,7 @@ impl Entity<Instruction> for Forwarder {
                 self.peer = Some(r);
             }
             Instruction::HandleMessage(n) => {
-                let target = if n >= self.hop_limit { &self.supervisor } else { self.peer.as_ref().expect("peer") };
+                let target = if n >= self.n_rounds { &self.supervisor } else { self.peer.as_ref().expect("peer") };
                 turn.message(target, Instruction::HandleMessage(n + 1));
             }
         }
@@ -40,8 +40,8 @@ impl Entity<Instruction> for Forwarder {
 }
 
 struct Supervisor {
-    latency_mode: bool,
-    total_transfers: u64,
+    n_actors: u32,
+    n_rounds: u32,
     remaining_to_receive: u32,
     start_time: Option<std::time::Instant>,
 }
@@ -58,11 +58,11 @@ impl Entity<Instruction> for Supervisor {
                 if self.remaining_to_receive == 0 {
                     let stop_time = std::time::Instant::now();
                     let duration = stop_time - self.start_time.unwrap();
-                    tracing::info!("Stop after {:?}; {:?} messages, so {:?} Hz ({} mode)",
+                    let n_messages: u64 = self.n_actors as u64 * self.n_rounds as u64;
+                    tracing::info!("Stop after {:?}; {:?} messages, so {:?} Hz",
                                    duration,
-                                   self.total_transfers,
-                                   (1000.0 * self.total_transfers as f64) / duration.as_millis() as f64,
-                                   if self.latency_mode { "latency" } else { "throughput" });
+                                   n_messages,
+                                   (1000.0 * n_messages as f64) / duration.as_millis() as f64);
                     turn.stop_root();
                 }
             },
@@ -78,24 +78,12 @@ async fn main() -> ActorResult {
         let args: Vec<String> = env::args().collect();
         let n_actors: u32 = args.get(1).unwrap_or(&"1000000".to_string()).parse()?;
         let n_rounds: u32 = args.get(2).unwrap_or(&"200".to_string()).parse()?;
-        let latency_mode: bool = match args.get(3).unwrap_or(&"throughput".to_string()).as_str() {
-            "latency" => true,
-            "throughput" => false,
-            _other => return Err("Invalid throughput/latency mode".into()),
-        };
         tracing::info!("Will run {:?} actors for {:?} rounds", n_actors, n_rounds);
 
-        let total_transfers: u64 = n_actors as u64 * n_rounds as u64;
-        let (hop_limit, injection_count) = if latency_mode {
-            (total_transfers, 1)
-        } else {
-            (n_rounds as u64, n_actors)
-        };
-
         let me = t.create(Supervisor {
-            latency_mode,
-            total_transfers,
-            remaining_to_receive: injection_count,
+            n_actors,
+            n_rounds,
+            remaining_to_receive: n_actors,
             start_time: None,
         });
 
@@ -105,7 +93,7 @@ async fn main() -> ActorResult {
             forwarders.push(
                 t.spawn_for_entity(None, true, Box::new(
                     Forwarder {
-                        hop_limit,
+                        n_rounds,
                         supervisor: me.clone(),
                         peer: forwarders.last().cloned(),
                     }))
@@ -115,19 +103,14 @@ async fn main() -> ActorResult {
         t.later(move |t| {
             t.message(&me, Instruction::SetPeer(me.clone()));
             t.later(move |t| {
-                let mut injected: u32 = 0;
                 for f in forwarders.into_iter() {
-                    if injected >= injection_count {
-                        break;
-                    }
                     t.message(&f, Instruction::HandleMessage(0));
-                    injected += 1;
                 }
                 Ok(())
             });
             Ok(())
         });
         Ok(())
-    }).await??;
+    }).await?;
     Ok(())
 }

syndicate-macros/examples/tokio-ring.rs

@@ -1,175 +0,0 @@
-use std::env;
-use std::sync::Arc;
-use std::sync::atomic::AtomicU64;
-use std::sync::atomic::Ordering;
-
-use tokio::sync::mpsc::{unbounded_channel, UnboundedSender};
-
-type Ref<T> = UnboundedSender<Box<T>>;
-
-#[derive(Debug)]
-enum Instruction {
-    SetPeer(Arc<Ref<Instruction>>),
-    HandleMessage(u64),
-}
-
-struct Forwarder {
-    hop_limit: u64,
-    supervisor: Arc<Ref<Instruction>>,
-    peer: Option<Arc<Ref<Instruction>>>,
-}
-
-impl Drop for Forwarder {
-    fn drop(&mut self) {
-        let r = self.peer.take();
-        let _ = tokio::spawn(async move {
-            drop(r);
-        });
-    }
-}
-
-enum Action { Continue, Stop }
-
-trait Actor<T> {
-    fn message(&mut self, message: T) -> Action;
-}
-
-fn send<T: std::marker::Send + 'static>(ch: &Arc<Ref<T>>, message: T) -> () {
-    match ch.send(Box::new(message)) {
-        Ok(()) => (),
-        Err(v) => panic!("Aiee! Could not send {:?}", v),
-    }
-}
-
-fn spawn<T: std::marker::Send + 'static, R: Actor<T> + std::marker::Send + 'static>(rt: Option<Arc<AtomicU64>>, mut ac: R) -> Arc<Ref<T>> {
-    let (tx, mut rx) = unbounded_channel::<Box<T>>();
-    if let Some(ref c) = rt {
-        c.fetch_add(1, Ordering::SeqCst);
-    }
-    tokio::spawn(async move {
-        loop {
-            match rx.recv().await {
-                None => break,
-                Some(message) => {
-                    match ac.message(*message) {
-                        Action::Continue => continue,
-                        Action::Stop => break,
-                    }
-                }
-            }
-        }
-        if let Some(c) = rt {
-            c.fetch_sub(1, Ordering::SeqCst);
-        }
-    });
-    Arc::new(tx)
-}
-
-impl Actor<Instruction> for Forwarder {
-    fn message(&mut self, message: Instruction) -> Action {
-        match message {
-            Instruction::SetPeer(r) => {
-                tracing::info!("Setting peer {:?}", r);
-                self.peer = Some(r);
-            }
-            Instruction::HandleMessage(n) => {
-                let target = if n >= self.hop_limit { &self.supervisor } else { self.peer.as_ref().expect("peer") };
-                send(target, Instruction::HandleMessage(n + 1));
-            }
-        }
-        Action::Continue
-    }
-}
-
-struct Supervisor {
-    latency_mode: bool,
-    total_transfers: u64,
-    remaining_to_receive: u32,
-    start_time: Option<std::time::Instant>,
-}
-
-impl Actor<Instruction> for Supervisor {
-    fn message(&mut self, message: Instruction) -> Action {
-        match message {
-            Instruction::SetPeer(_) => {
-                tracing::info!("Start");
-                self.start_time = Some(std::time::Instant::now());
-            },
-            Instruction::HandleMessage(_n) => {
-                self.remaining_to_receive -= 1;
-                if self.remaining_to_receive == 0 {
-                    let stop_time = std::time::Instant::now();
-                    let duration = stop_time - self.start_time.unwrap();
-                    tracing::info!("Stop after {:?}; {:?} messages, so {:?} Hz ({} mode)",
-                                   duration,
-                                   self.total_transfers,
-                                   (1000.0 * self.total_transfers as f64) / duration.as_millis() as f64,
-                                   if self.latency_mode { "latency" } else { "throughput" });
-                    return Action::Stop;
-                }
-            },
-        }
-        Action::Continue
-    }
-}
-
-#[tokio::main]
-async fn main() -> Result<(), Box<dyn std::error::Error + std::marker::Send + std::marker::Sync>> {
-    syndicate::convenient_logging()?;
-
-    let args: Vec<String> = env::args().collect();
-    let n_actors: u32 = args.get(1).unwrap_or(&"1000000".to_string()).parse()?;
-    let n_rounds: u32 = args.get(2).unwrap_or(&"200".to_string()).parse()?;
-    let latency_mode: bool = match args.get(3).unwrap_or(&"throughput".to_string()).as_str() {
-        "latency" => true,
-        "throughput" => false,
-        _other => return Err("Invalid throughput/latency mode".into()),
-    };
-    tracing::info!("Will run {:?} actors for {:?} rounds", n_actors, n_rounds);
-
-    let count = Arc::new(AtomicU64::new(0));
-
-    let total_transfers: u64 = n_actors as u64 * n_rounds as u64;
-    let (hop_limit, injection_count) = if latency_mode {
-        (total_transfers, 1)
-    } else {
-        (n_rounds as u64, n_actors)
-    };
-
-    let me = spawn(Some(count.clone()), Supervisor {
-        latency_mode,
-        total_transfers,
-        remaining_to_receive: injection_count,
-        start_time: None,
-    });
-
-    let mut forwarders: Vec<Arc<Ref<Instruction>>> = Vec::new();
-    for _i in 0 .. n_actors {
-        if _i % 10000 == 0 { tracing::info!("Actor {:?}", _i); }
-        forwarders.push(spawn(None, Forwarder {
-            hop_limit,
-            supervisor: me.clone(),
-            peer: forwarders.last().cloned(),
-        }));
-    }
-    send(&forwarders[0], Instruction::SetPeer(forwarders.last().expect("an entity").clone()));
-    send(&me, Instruction::SetPeer(me.clone()));
-
-    let mut injected: u32 = 0;
-    for f in forwarders.into_iter() {
-        if injected >= injection_count {
-            break;
-        }
-        send(&f, Instruction::HandleMessage(0));
-        injected += 1;
-    }
-
-    loop {
-        if count.load(Ordering::SeqCst) == 0 {
-            break;
-        }
-        tokio::time::sleep(tokio::time::Duration::from_millis(100)).await;
-    }
-
-    Ok(())
-}

syndicate-macros/src/lib.rs

@@ -27,7 +27,6 @@ use pat::lit;
 
 enum SymbolVariant<'a> {
     Normal(&'a str),
-    #[allow(dead_code)] // otherwise we get 'warning: field `0` is never read'
     Binder(&'a str),
     Substitution(&'a str),
     Discard,
@@ -36,7 +35,7 @@ enum SymbolVariant<'a> {
 fn compile_sequence_members(vs: &[IOValue]) -> Vec<TokenStream> {
     vs.iter().enumerate().map(|(i, f)| {
         let p = compile_pattern(f);
-        quote!((syndicate::value::Value::from(#i).wrap(), #p))
+        quote!((#i .into(), #p))
     }).collect::<Vec<_>>()
 }
 
@@ -80,6 +79,10 @@ impl ValueCompiler {
         match v.value() {
             Value::Boolean(b) =>
                 quote!(#V_::Value::from(#b).wrap()),
+            Value::Float(f) => {
+                let f = f.0;
+                quote!(#V_::Value::from(#f).wrap())
+            }
             Value::Double(d) => {
                 let d = d.0;
                 quote!(#V_::Value::from(#d).wrap())
@@ -151,14 +154,16 @@ fn compile_pattern(v: &IOValue) -> TokenStream {
     #[allow(non_snake_case)]
     let V_: TokenStream = quote!(syndicate::value);
     #[allow(non_snake_case)]
-    let MapFrom_: TokenStream = quote!(<#V_::Map<_, _>>::from);
+    let MapFromIterator_: TokenStream = quote!(<#V_::Map<_, _> as std::iter::FromIterator<_>>::from_iter);
 
     match v.value() {
         Value::Symbol(s) => match analyze_symbol(&s, true) {
             SymbolVariant::Binder(_) =>
-                quote!(#P_::Pattern::Bind{ pattern: Box::new(#P_::Pattern::Discard) }),
+                quote!(#P_::Pattern::DBind(Box::new(#P_::DBind {
+                    pattern: #P_::Pattern::DDiscard(Box::new(#P_::DDiscard))
+                }))),
             SymbolVariant::Discard =>
-                quote!(#P_::Pattern::Discard),
+                quote!(#P_::Pattern::DDiscard(Box::new(#P_::DDiscard))),
             SymbolVariant::Substitution(s) =>
                 lit(Ident::new(s, Span::call_site())),
             SymbolVariant::Normal(_) =>
@@ -170,7 +175,9 @@ fn compile_pattern(v: &IOValue) -> TokenStream {
                 Some(label) =>
                     if label.starts_with("$") && r.arity() == 1 {
                         let nested = compile_pattern(&r.fields()[0]);
-                        quote!(#P_::Pattern::Bind{ pattern: Box::new(#nested) })
+                        quote!(#P_::Pattern::DBind(Box::new(#P_::DBind {
+                            pattern: #nested
+                        })))
                     } else {
                         let label_stx = if label.starts_with("=") {
                             let id = Ident::new(&label[1..], Span::call_site());
@@ -179,19 +186,18 @@ fn compile_pattern(v: &IOValue) -> TokenStream {
                             quote!(#V_::Value::symbol(#label).wrap())
                         };
                         let members = compile_sequence_members(r.fields());
-                        quote!(#P_::Pattern::Group {
-                            type_: Box::new(#P_::GroupType::Rec { label: #label_stx }),
-                            entries: #MapFrom_([#(#members),*]),
-                        })
+                        quote!(#P_::Pattern::DCompound(Box::new(#P_::DCompound::Rec {
+                            label: #label_stx,
+                            fields: vec![#(#members),*],
+                        })))
                     }
             }
         }
         Value::Sequence(vs) => {
             let members = compile_sequence_members(vs);
-            quote!(#P_::Pattern::Group {
-                type_: Box::new(#P_::GroupType::Arr),
-                entries: #MapFrom_([#(#members),*]),
-            })
+            quote!(#P_::Pattern::DCompound(Box::new(#P_::DCompound::Arr {
+                items: vec![#(#members),*],
+            })))
         }
         Value::Set(_) =>
             panic!("Cannot match sets in patterns"),
@@ -201,10 +207,9 @@ fn compile_pattern(v: &IOValue) -> TokenStream {
                 let v = compile_pattern(v);
                 quote!((#k, #v))
             }).collect::<Vec<_>>();
-            quote!(#P_::Pattern::Group {
-                type_: Box::new(#P_::GroupType::Dict),
-                entries: #MapFrom_([#(#members),*]),
-            })
+            quote!(#P_::Pattern::DCompound(Box::new(#P_::DCompound::Dict {
+                entries: #MapFromIterator_(vec![#(#members),*])
+            })))
         }
         _ => lit(ValueCompiler::for_patterns().compile(v)),
     }

syndicate-macros/src/pat.rs

@@ -15,9 +15,10 @@ pub fn lit<T: ToTokens>(e: T) -> TokenStream2 {
 }
 
 fn compile_sequence_members(stxs: &Vec<Stx>) -> Result<Vec<TokenStream2>, &'static str> {
-    stxs.iter().enumerate().map(|(i, stx)| {
-        let p = to_pattern_expr(stx)?;
-        Ok(quote!((syndicate::value::Value::from(#i).wrap(), #p)))
+    stxs.iter().map(|stx| {
+        // let p = to_pattern_expr(stx)?;
+        // Ok(quote!(#p))
+        to_pattern_expr(stx)
     }).collect()
 }
 
@@ -27,7 +28,7 @@ pub fn to_pattern_expr(stx: &Stx) -> Result<TokenStream2, &'static str> {
     #[allow(non_snake_case)]
     let V_: TokenStream2 = quote!(syndicate::value);
     #[allow(non_snake_case)]
-    let MapFrom_: TokenStream2 = quote!(<#V_::Map<_, _>>::from);
+    let MapFromIterator_: TokenStream2 = quote!(<#V_::Map<_, _> as std::iter::FromIterator<_>>::from_iter);
 
     match stx {
         Stx::Atom(v) =>
@@ -40,27 +41,26 @@ pub fn to_pattern_expr(stx: &Stx) -> Result<TokenStream2, &'static str> {
                     None => to_pattern_expr(&Stx::Discard)?,
                 }
             };
-            Ok(quote!(#P_::Pattern::Bind { pattern: Box::new(#inner_pat_expr) }))
+            Ok(quote!(#P_::Pattern::DBind(Box::new(#P_::DBind { pattern: #inner_pat_expr }))))
         }
         Stx::Subst(e) =>
             Ok(lit(e)),
         Stx::Discard =>
-            Ok(quote!(#P_::Pattern::Discard)),
+            Ok(quote!(#P_::Pattern::DDiscard(Box::new(#P_::DDiscard)))),
 
         Stx::Rec(l, fs) => {
             let label = to_value_expr(&*l)?;
             let members = compile_sequence_members(fs)?;
-            Ok(quote!(#P_::Pattern::Group {
-                type_: Box::new(#P_::GroupType::Rec { label: #label }),
-                entries: #MapFrom_([#(#members),*]),
-            }))
+            Ok(quote!(#P_::Pattern::DCompound(Box::new(#P_::DCompound::Rec {
+                label: #label,
+                fields: vec![#(#members),*],
+            }))))
         },
         Stx::Seq(stxs) => {
             let members = compile_sequence_members(stxs)?;
-            Ok(quote!(#P_::Pattern::Group {
-                type_: Box::new(#P_::GroupType::Arr),
-                entries: #MapFrom_([#(#members),*]),
-            }))
+            Ok(quote!(#P_::Pattern::DCompound(Box::new(#P_::DCompound::Arr {
+                items: vec![#(#members),*],
+            }))))
         }
         Stx::Set(_stxs) =>
             Err("Set literals not supported in patterns"),
@@ -70,10 +70,9 @@ pub fn to_pattern_expr(stx: &Stx) -> Result<TokenStream2, &'static str> {
                 let v = to_pattern_expr(v)?;
                 Ok(quote!((#k, #v)))
             }).collect::<Result<Vec<_>, &'static str>>()?;
-            Ok(quote!(#P_::Pattern::Group {
-                type_: Box::new(#P_::GroupType::Dict),
-                entries: #MapFrom_([#(#members),*])
-            }))
+            Ok(quote!(#P_::Pattern::DCompound(Box::new(#P_::DCompound::Dict {
+                entries: #MapFromIterator_(vec![#(#members),*])
+            }))))
         }
     }
 }

syndicate-macros/src/stx.rs

@@ -15,6 +15,7 @@ use syn::parse::Parser;
 use syn::parse::ParseStream;
 use syn::parse_str;
 
+use syndicate::value::Float;
 use syndicate::value::Double;
 use syndicate::value::IOValue;
 use syndicate::value::NestedValue;
@@ -265,7 +266,7 @@ fn parse1(c: Cursor) -> Result<(Stx, Cursor)> {
                 IOValue::new(i.base10_parse::<i128>()?)
             }
             Lit::Float(f) => if f.suffix() == "f32" {
-                IOValue::new(&Double(f.base10_parse::<f32>()? as f64))
+                IOValue::new(&Float(f.base10_parse::<f32>()?))
             } else {
                 IOValue::new(&Double(f.base10_parse::<f64>()?))
             }

syndicate-macros/src/val.rs

@@ -50,6 +50,10 @@ pub fn value_to_value_expr(v: &IOValue) -> TokenStream2 {
     match v.value() {
         Value::Boolean(b) =>
             quote!(#V_::Value::from(#b).wrap()),
+        Value::Float(f) => {
+            let f = f.0;
+            quote!(#V_::Value::from(#f).wrap())
+        }
         Value::Double(d) => {
             let d = d.0;
             quote!(#V_::Value::from(#d).wrap())

syndicate-rs.code-workspace

@@ -1,15 +0,0 @@
-{
-	"folders": [
-		{
-			"path": "."
-		},
-		{
-			"path": "../syndicate-protocols"
-		}
-	],
-	"settings": {
-		"files.exclude": {
-			"target": true
-		}
-	}
-}

syndicate-schema-plugin/Cargo.toml

@@ -1,19 +0,0 @@
-[package]
-name = "syndicate-schema-plugin"
-version = "0.9.0"
-authors = ["Tony Garnock-Jones <tonyg@leastfixedpoint.com>"]
-edition = "2018"
-
-description = "Support for using Preserves Schema with Syndicate macros."
-homepage = "https://syndicate-lang.org/"
-repository = "https://git.syndicate-lang.org/syndicate-lang/syndicate-rs"
-license = "Apache-2.0"
-
-[lib]
-
-[dependencies]
-preserves-schema = "5.995"
-syndicate = { path = "../syndicate", version = "0.40.0"}
-
-[package.metadata.workspaces]
-independent = true

syndicate-schema-plugin/src/lib.rs

@@ -1,3 +0,0 @@
-mod pattern_plugin;
-
-pub use pattern_plugin::PatternPlugin;

syndicate-schema-plugin/src/pattern_plugin.rs

@@ -1,164 +0,0 @@
-use preserves_schema::*;
-use preserves_schema::compiler::*;
-use preserves_schema::compiler::context::ModuleContext;
-use preserves_schema::compiler::types::definition_type;
-use preserves_schema::compiler::types::Purpose;
-use preserves_schema::gen::schema::*;
-use preserves_schema::syntax::block::escape_string;
-use preserves_schema::syntax::block::constructors::*;
-
-use std::iter::FromIterator;
-
-use syndicate::pattern::lift_literal;
-use syndicate::schemas::dataspace_patterns as P;
-use syndicate::value::IOValue;
-use syndicate::value::Map;
-use syndicate::value::NestedValue;
-
-#[derive(Debug)]
-pub struct PatternPlugin;
-
-type WalkState<'a, 'm, 'b> =
-    preserves_schema::compiler::cycles::WalkState<&'a ModuleContext<'m, 'b>>;
-
-impl Plugin for PatternPlugin {
-    fn generate_definition(
-        &self,
-        ctxt: &mut ModuleContext,
-        definition_name: &str,
-        definition: &Definition,
-    ) {
-        if ctxt.mode == context::ModuleContextMode::TargetGeneric {
-            let mut s = WalkState::new(ctxt, ctxt.module_path.clone());
-            if let Some(p) = definition.wc(&mut s) {
-                let ty = definition_type(&ctxt.module_path,
-                                         Purpose::Codegen,
-                                         definition_name,
-                                         definition);
-                let v = syndicate::language().unparse(&p);
-                let v = preserves_schema::support::preserves::value::TextWriter::encode(
-                    &mut preserves_schema::support::preserves::value::NoEmbeddedDomainCodec,
-                    &v).unwrap();
-                ctxt.define_type(item(seq![
-                    "impl",
-                    ty.generic_decl(ctxt),
-                    " ",
-                    names::render_constructor(definition_name),
-                    ty.generic_arg(ctxt),
-                    " ", codeblock![
-                        seq!["#[allow(unused)] pub fn wildcard_dataspace_pattern() ",
-                             "-> syndicate::schemas::dataspace_patterns::Pattern ",
-                             codeblock![
-                                 "use syndicate::schemas::dataspace_patterns::*;",
-                                 "use preserves_schema::Codec;",
-                                 seq!["let _v = syndicate::value::text::from_str(",
-                                      escape_string(&v),
-                                      ", syndicate::value::ViaCodec::new(syndicate::value::NoEmbeddedDomainCodec)).unwrap();"],
-                                 "syndicate::language().parse(&_v).unwrap()"]]]]));
-            }
-        }
-    }
-}
-
-fn discard() -> P::Pattern {
-    P::Pattern::Discard
-}
-
-trait WildcardPattern {
-    fn wc(&self, s: &mut WalkState) -> Option<P::Pattern>;
-}
-
-impl WildcardPattern for Definition {
-    fn wc(&self, s: &mut WalkState) -> Option<P::Pattern> {
-        match self {
-            Definition::Or { .. } => None,
-            Definition::And { .. } => None,
-            Definition::Pattern(p) => p.wc(s),
-        }
-    }
-}
-
-impl WildcardPattern for Pattern {
-    fn wc(&self, s: &mut WalkState) -> Option<P::Pattern> {
-        match self {
-            Pattern::CompoundPattern(p) => p.wc(s),
-            Pattern::SimplePattern(p) => p.wc(s),
-        }
-    }
-}
-
-fn from_io(v: &IOValue) -> Option<P::_Any> {
-    Some(v.value().copy_via(&mut |_| Err(())).ok()?.wrap())
-}
-
-impl WildcardPattern for CompoundPattern {
-    fn wc(&self, s: &mut WalkState) -> Option<P::Pattern> {
-        match self {
-            CompoundPattern::Tuple { patterns } |
-            CompoundPattern::TuplePrefix { fixed: patterns, .. }=>
-                Some(P::Pattern::Group {
-                    type_: Box::new(P::GroupType::Arr),
-                    entries: patterns.iter().enumerate()
-                        .map(|(i, p)| Some((P::_Any::new(i), unname(p).wc(s)?)))
-                        .collect::<Option<Map<P::_Any, P::Pattern>>>()?,
-                }),
-            CompoundPattern::Dict { entries } =>
-                Some(P::Pattern::Group {
-                    type_: Box::new(P::GroupType::Dict),
-                    entries: Map::from_iter(
-                        entries.0.iter()
-                            .map(|(k, p)| Some((from_io(k)?, unname_simple(p).wc(s)?)))
-                            .filter(|e| discard() != e.as_ref().unwrap().1)
-                            .collect::<Option<Vec<(P::_Any, P::Pattern)>>>()?
-                            .into_iter()),
-                }),
-            CompoundPattern::Rec { label, fields } => match (unname(label), unname(fields)) {
-                (Pattern::SimplePattern(label), Pattern::CompoundPattern(fields)) =>
-                    match (*label, *fields) {
-                        (SimplePattern::Lit { value }, CompoundPattern::Tuple { patterns }) =>
-                            Some(P::Pattern::Group{
-                                type_: Box::new(P::GroupType::Rec { label: from_io(&value)? }),
-                                entries: patterns.iter().enumerate()
-                                    .map(|(i, p)| Some((P::_Any::new(i), unname(p).wc(s)?)))
-                                    .collect::<Option<Map<P::_Any, P::Pattern>>>()?,
-                            }),
-                        _ => None,
-                    },
-                _ => None,
-            },
-        }
-    }
-}
-
-impl WildcardPattern for SimplePattern {
-    fn wc(&self, s: &mut WalkState) -> Option<P::Pattern> {
-        match self {
-            SimplePattern::Any |
-            SimplePattern::Atom { .. } |
-            SimplePattern::Embedded { .. } |
-            SimplePattern::Seqof { .. } |
-            SimplePattern::Setof { .. } |
-            SimplePattern::Dictof { .. } => Some(discard()),
-            SimplePattern::Lit { value } => Some(lift_literal(&from_io(value)?)),
-            SimplePattern::Ref(r) => s.cycle_check(
-                r,
-                |ctxt, r| ctxt.bundle.lookup_definition(r).map(|v| v.0),
-                |s, d| d.and_then(|d| d.wc(s)).or_else(|| Some(discard())),
-                || Some(discard())),
-        }
-    }
-}
-
-fn unname(np: &NamedPattern) -> Pattern {
-    match np {
-        NamedPattern::Anonymous(p) => (**p).clone(),
-        NamedPattern::Named(b) => Pattern::SimplePattern(Box::new(b.pattern.clone())),
-    }
-}
-
-fn unname_simple(np: &NamedSimplePattern) -> &SimplePattern {
-    match np {
-        NamedSimplePattern::Anonymous(p) => p,
-        NamedSimplePattern::Named(b) => &b.pattern,
-    }
-}

syndicate-server/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "syndicate-server"
-version = "0.45.0"
+version = "0.34.0"
 authors = ["Tony Garnock-Jones <tonyg@leastfixedpoint.com>"]
 edition = "2018"
 
@@ -13,14 +13,13 @@ license = "Apache-2.0"
 jemalloc = ["dep:tikv-jemallocator"]
 
 [build-dependencies]
-preserves-schema = "5.995"
-syndicate = { path = "../syndicate", version = "0.40.0"}
-syndicate-schema-plugin = { path = "../syndicate-schema-plugin", version = "0.9.0"}
+preserves-schema = "4.991"
+syndicate = { path = "../syndicate", version = "0.30.0"}
 
 [dependencies]
-preserves-schema = "5.995"
-syndicate = { path = "../syndicate", version = "0.40.0"}
-syndicate-macros = { path = "../syndicate-macros", version = "0.32.0"}
+preserves-schema = "4.991"
+syndicate = { path = "../syndicate", version = "0.30.0"}
+syndicate-macros = { path = "../syndicate-macros", version = "0.25.0"}
 
 chrono = "0.4"
 futures = "0.3"
@@ -32,16 +31,15 @@ structopt = "0.3"
 
 tikv-jemallocator = { version = "0.5.0", optional = true }
 
+tungstenite = "0.13"
+tokio-tungstenite = "0.14"
+
 tokio = { version = "1.10", features = ["io-std", "time", "process"] }
 tokio-util = "0.6"
-tokio-stream = "0.1"
 
 tracing = "0.1"
 tracing-subscriber = "0.2"
 tracing-futures = "0.2"
-hyper = { version = "0.14.27", features = ["server", "http1", "stream"] }
-hyper-tungstenite = "0.11.1"
-parking_lot = "0.12.1"
 
 [package.metadata.workspaces]
 independent = true

syndicate-server/build.rs

@@ -1,13 +1,168 @@
 use preserves_schema::compiler::*;
 
+mod pattern_plugin {
+    use preserves_schema::*;
+    use preserves_schema::compiler::*;
+    use preserves_schema::compiler::context::ModuleContext;
+    use preserves_schema::gen::schema::*;
+    use preserves_schema::syntax::block::escape_string;
+    use preserves_schema::syntax::block::constructors::*;
+
+    use std::iter::FromIterator;
+
+    use syndicate::pattern::lift_literal;
+    use syndicate::schemas::dataspace_patterns as P;
+    use syndicate::value::IOValue;
+    use syndicate::value::Map;
+    use syndicate::value::NestedValue;
+
+    #[derive(Debug)]
+    pub struct PatternPlugin;
+
+    type WalkState<'a, 'm, 'b> =
+        preserves_schema::compiler::cycles::WalkState<&'a ModuleContext<'m, 'b>>;
+
+    impl Plugin for PatternPlugin {
+        fn generate_definition(
+            &self,
+            ctxt: &mut ModuleContext,
+            definition_name: &str,
+            definition: &Definition,
+        ) {
+            if ctxt.mode == context::ModuleContextMode::TargetGeneric {
+                let mut s = WalkState::new(ctxt, ctxt.module_path.clone());
+                if let Some(p) = definition.wc(&mut s) {
+                    let v = syndicate::language().unparse(&p);
+                    let v = preserves_schema::support::preserves::value::TextWriter::encode(
+                        &mut preserves_schema::support::preserves::value::NoEmbeddedDomainCodec,
+                        &v).unwrap();
+                    ctxt.define_type(item(seq![
+                        "impl ", definition_name.to_owned(), " ", codeblock![
+                            seq!["#[allow(unused)] pub fn wildcard_dataspace_pattern() ",
+                                 "-> syndicate::schemas::dataspace_patterns::Pattern ",
+                                 codeblock![
+                                     "use syndicate::schemas::dataspace_patterns::*;",
+                                     "use preserves_schema::Codec;",
+                                     seq!["let _v = syndicate::value::text::from_str(",
+                                          escape_string(&v),
+                                          ", syndicate::value::ViaCodec::new(syndicate::value::NoEmbeddedDomainCodec)).unwrap();"],
+                                     "syndicate::language().parse(&_v).unwrap()"]]]]));
+                }
+            }
+        }
+    }
+
+    fn discard() -> P::Pattern {
+        P::Pattern::DDiscard(Box::new(P::DDiscard))
+    }
+
+    trait WildcardPattern {
+        fn wc(&self, s: &mut WalkState) -> Option<P::Pattern>;
+    }
+
+    impl WildcardPattern for Definition {
+        fn wc(&self, s: &mut WalkState) -> Option<P::Pattern> {
+            match self {
+                Definition::Or { .. } => None,
+                Definition::And { .. } => None,
+                Definition::Pattern(p) => p.wc(s),
+            }
+        }
+    }
+
+    impl WildcardPattern for Pattern {
+        fn wc(&self, s: &mut WalkState) -> Option<P::Pattern> {
+            match self {
+                Pattern::CompoundPattern(p) => p.wc(s),
+                Pattern::SimplePattern(p) => p.wc(s),
+            }
+        }
+    }
+
+    fn from_io(v: &IOValue) -> Option<P::_Any> {
+        Some(v.value().copy_via(&mut |_| Err(())).ok()?.wrap())
+    }
+
+    impl WildcardPattern for CompoundPattern {
+        fn wc(&self, s: &mut WalkState) -> Option<P::Pattern> {
+            match self {
+                CompoundPattern::Tuple { patterns } =>
+                    Some(P::Pattern::DCompound(Box::new(P::DCompound::Arr {
+                        items: patterns.iter()
+                            .map(|p| unname(p).wc(s))
+                            .collect::<Option<Vec<P::Pattern>>>()?,
+                    }))),
+                CompoundPattern::TuplePrefix { .. } =>
+                    Some(discard()),
+                CompoundPattern::Dict { entries } =>
+                    Some(P::Pattern::DCompound(Box::new(P::DCompound::Dict {
+                        entries: Map::from_iter(
+                            entries.0.iter()
+                                .map(|(k, p)| Some((from_io(k)?, unname_simple(p).wc(s)?)))
+                                .filter(|e| discard() != e.as_ref().unwrap().1)
+                                .collect::<Option<Vec<(P::_Any, P::Pattern)>>>()?
+                                .into_iter()),
+                    }))),
+                CompoundPattern::Rec { label, fields } => match (unname(label), unname(fields)) {
+                    (Pattern::SimplePattern(label), Pattern::CompoundPattern(fields)) =>
+                        match (*label, *fields) {
+                            (SimplePattern::Lit { value }, CompoundPattern::Tuple { patterns }) =>
+                                Some(P::Pattern::DCompound(Box::new(P::DCompound::Rec {
+                                    label: from_io(&value)?,
+                                    fields: patterns.iter()
+                                        .map(|p| unname(p).wc(s))
+                                        .collect::<Option<Vec<P::Pattern>>>()?,
+                                }))),
+                            _ => None,
+                        },
+                    _ => None,
+                },
+            }
+        }
+    }
+
+    impl WildcardPattern for SimplePattern {
+        fn wc(&self, s: &mut WalkState) -> Option<P::Pattern> {
+            match self {
+                SimplePattern::Any |
+                SimplePattern::Atom { .. } |
+                SimplePattern::Embedded { .. } |
+                SimplePattern::Seqof { .. } |
+                SimplePattern::Setof { .. } |
+                SimplePattern::Dictof { .. } => Some(discard()),
+                SimplePattern::Lit { value } => Some(lift_literal(&from_io(value)?)),
+                SimplePattern::Ref(r) => s.cycle_check(
+                    r,
+                    |ctxt, r| ctxt.bundle.lookup_definition(r).map(|v| v.0),
+                    |s, d| d.and_then(|d| d.wc(s)).or_else(|| Some(discard())),
+                    || Some(discard())),
+            }
+        }
+    }
+
+    fn unname(np: &NamedPattern) -> Pattern {
+        match np {
+            NamedPattern::Anonymous(p) => (**p).clone(),
+            NamedPattern::Named(b) => Pattern::SimplePattern(Box::new(b.pattern.clone())),
+        }
+    }
+
+    fn unname_simple(np: &NamedSimplePattern) -> &SimplePattern {
+        match np {
+            NamedSimplePattern::Anonymous(p) => p,
+            NamedSimplePattern::Named(b) => &b.pattern,
+        }
+    }
+}
+
 fn main() -> std::io::Result<()> {
     let buildroot = std::path::PathBuf::from(std::env::var_os("OUT_DIR").unwrap());
 
     let mut gen_dir = buildroot.clone();
     gen_dir.push("src/schemas");
 
-    let mut c = CompilerConfig::new("crate::schemas".to_owned());
-    c.plugins.push(Box::new(syndicate_schema_plugin::PatternPlugin));
+    let mut c = CompilerConfig::new(gen_dir, "crate::schemas".to_owned());
+    c.plugins.push(Box::new(pattern_plugin::PatternPlugin));
     c.add_external_module(ExternalModule::new(vec!["EntityRef".to_owned()], "syndicate::actor"));
     c.add_external_module(
         ExternalModule::new(vec!["TransportAddress".to_owned()],
@@ -28,5 +183,5 @@ fn main() -> std::io::Result<()> {
     let inputs = expand_inputs(&vec!["protocols/schema-bundle.bin".to_owned()])?;
     c.load_schemas_and_bundles(&inputs, &vec![])?;
     c.load_xref_bin("syndicate", syndicate::schemas::_bundle())?;
-    compile(&c, &mut CodeCollector::files(gen_dir))
+    compile(&c)
 }

syndicate-server/examples/pingpong.rs

@@ -177,7 +177,7 @@ async fn main() -> ActorResult {
             })?;
 
             if let PingPongMode::Ping(c) = &config.mode {
-                let facet = t.facet_ref();
+                let facet = t.facet.clone();
                 let turn_count = c.turn_count;
                 let action_count = c.action_count;
                 let account = Arc::clone(t.account());

syndicate-server/examples/producer.rs

@@ -28,7 +28,7 @@ async fn main() -> ActorResult {
     let (i, o) = TcpStream::connect("127.0.0.1:9001").await?.into_split();
     Actor::top(None, |t| {
         relay::connect_stream(t, i, o, false, sturdyref, (), move |_state, t, ds| {
-            let facet = t.facet_ref();
+            let facet = t.facet.clone();
             let padding = AnyValue::new(&vec![0u8; config.bytes_padding][..]);
             let action_count = config.action_count;
             let account = Account::new(None, None);

syndicate-server/examples/state-producer.rs

@@ -22,7 +22,7 @@ async fn main() -> ActorResult {
     let (i, o) = TcpStream::connect("127.0.0.1:9001").await?.into_split();
     Actor::top(None, |t| {
         relay::connect_stream(t, i, o, false, sturdyref, (), move |_state, t, ds| {
-            let facet = t.facet_ref();
+            let facet = t.facet.clone();
             let account = Account::new(None, None);
             t.linked_task(Some(AnyValue::symbol("sender")), async move {
                 let presence = rec![AnyValue::symbol("Present"), AnyValue::new(std::process::id())];

syndicate-server/protocols/schema-bundle.bin

@@ -1,17 +1,10 @@
-´³bundle·µ³control„´³schema·³version°

³definitions·³
-ExitServer´³rec´³lit³exit„´³tupleµ´³named³code´³atom³
SignedInteger„„„„„„³embeddedType€„„µ³
documentation„´³schema·³version°

³definitions·³Url´³orµµ±present´³dict·³url´³named³url´³atom³String„„„„„µ±invalid´³dict·³url´³named³url³any„„„„µ±absent´³dict·„„„„„³IOList´³orµµ±bytes´³atom³
+´³bundle·µ³
documentation„´³schema·³version°

³definitions·³Url´³orµµ±present´³dict·³url´³named³url´³atom³String„„„„„µ±invalid´³dict·³url´³named³url³any„„„„µ±absent´³dict·„„„„„³IOList´³orµµ±bytes´³atom³
 ByteString„„µ±string´³atom³String„„µ±nested´³seqof´³refµ„³IOList„„„„„³Metadata´³rec´³lit³metadata„´³tupleµ´³named³object³any„´³named³info´³dictof´³atom³Symbol„³any„„„„„³Description´³orµµ±present´³dict·³description´³named³description´³refµ„³IOList„„„„„µ±invalid´³dict·³description´³named³description³any„„„„µ±absent´³dict·„„„„„„³embeddedType€„„µ³externalServices„´³schema·³version°

³definitions·³Process´³orµµ±simple´³refµ„³CommandLine„„µ±full´³refµ„³FullProcess„„„„³Service´³refµ„³
DaemonService„³ClearEnv´³orµµ±present´³dict·³clearEnv´³named³clearEnv´³atom³Boolean„„„„„µ±invalid´³dict·³clearEnv´³named³clearEnv³any„„„„µ±absent´³dict·„„„„„³EnvValue´³orµµ±set´³atom³String„„µ±remove´³lit€„„µ±invalid³any„„„³Protocol´³orµµ±none´³lit³none„„µ±binarySyndicate´³lit³application/syndicate„„µ±
textSyndicate´³lit³text/syndicate„„„„³
 ProcessDir´³orµµ±present´³dict·³dir´³named³dir´³atom³String„„„„„µ±invalid´³dict·³dir´³named³dir³any„„„„µ±absent´³dict·„„„„„³
 ProcessEnv´³orµµ±present´³dict·³env´³named³env´³dictof´³refµ„³EnvVariable„´³refµ„³EnvValue„„„„„„µ±invalid´³dict·³env´³named³env³any„„„„µ±absent´³dict·„„„„„³CommandLine´³orµµ±shell´³atom³String„„µ±full´³refµ„³FullCommandLine„„„„³EnvVariable´³orµµ±string´³atom³String„„µ±symbol´³atom³Symbol„„µ±invalid³any„„„³FullProcess´³andµ´³dict·³argv´³named³argv´³refµ„³CommandLine„„„„´³named³env´³refµ„³
 ProcessEnv„„´³named³dir´³refµ„³
-ProcessDir„„´³named³clearEnv´³refµ„³ClearEnv„„„„³ReadyOnStart´³orµµ±present´³dict·³readyOnStart´³named³readyOnStart´³atom³Boolean„„„„„µ±invalid´³dict·³readyOnStart´³named³readyOnStart³any„„„„µ±absent´³dict·„„„„„³RestartField´³orµµ±present´³dict·³restart´³named³restart´³refµ„³
RestartPolicy„„„„„µ±invalid´³dict·³restart´³named³restart³any„„„„µ±absent´³dict·„„„„„³
DaemonProcess´³rec´³lit³daemon„´³tupleµ´³named³id³any„´³named³config´³refµ„³DaemonProcessSpec„„„„„³
DaemonService´³rec´³lit³daemon„´³tupleµ´³named³id³any„„„„³
ProtocolField´³orµµ±present´³dict·³protocol´³named³protocol´³refµ„³Protocol„„„„„µ±invalid´³dict·³protocol´³named³protocol³any„„„„µ±absent´³dict·„„„„„³
RestartPolicy´³orµµ±always´³lit³always„„µ±onError´³lit³on-error„„µ±all´³lit³all„„µ±never´³lit³never„„„„³FullCommandLine´³tuplePrefixµ´³named³program´³atom³String„„„´³named³args´³seqof´³atom³String„„„„³DaemonProcessSpec´³orµµ±simple´³refµ„³CommandLine„„µ±oneShot´³rec´³lit³one-shot„´³tupleµ´³named³setup´³refµ„³CommandLine„„„„„„µ±full´³refµ„³FullDaemonProcess„„„„³FullDaemonProcess´³andµ´³named³process´³refµ„³FullProcess„„´³named³readyOnStart´³refµ„³ReadyOnStart„„´³named³restart´³refµ„³RestartField„„´³named³protocol´³refµ„³
ProtocolField„„„„„³embeddedType´³refµ³	EntityRef„³Cap„„„µ³internalServices„´³schema·³version°

³definitions·³	ConfigEnv´³dictof´³atom³Symbol„³any„³
-Gatekeeper´³rec´³lit³
-gatekeeper„´³tupleµ´³named³	bindspace´³embedded´³refµ³
-gatekeeper„³Bind„„„„„„³
-HttpRouter´³rec´³lit³http-router„´³tupleµ´³named³httpd´³embedded³any„„„„„³TcpWithHttp´³rec´³lit³relay-listener„´³tupleµ´³named³addr´³refµ³TransportAddress„³Tcp„„´³named³
+ProcessDir„„´³named³clearEnv´³refµ„³ClearEnv„„„„³ReadyOnStart´³orµµ±present´³dict·³readyOnStart´³named³readyOnStart´³atom³Boolean„„„„„µ±invalid´³dict·³readyOnStart´³named³readyOnStart³any„„„„µ±absent´³dict·„„„„„³RestartField´³orµµ±present´³dict·³restart´³named³restart´³refµ„³
RestartPolicy„„„„„µ±invalid´³dict·³restart´³named³restart³any„„„„µ±absent´³dict·„„„„„³
DaemonProcess´³rec´³lit³daemon„´³tupleµ´³named³id³any„´³named³config´³refµ„³DaemonProcessSpec„„„„„³
DaemonService´³rec´³lit³daemon„´³tupleµ´³named³id³any„„„„³
ProtocolField´³orµµ±present´³dict·³protocol´³named³protocol´³refµ„³Protocol„„„„„µ±invalid´³dict·³protocol´³named³protocol³any„„„„µ±absent´³dict·„„„„„³
RestartPolicy´³orµµ±always´³lit³always„„µ±onError´³lit³on-error„„µ±all´³lit³all„„µ±never´³lit³never„„„„³FullCommandLine´³tuplePrefixµ´³named³program´³atom³String„„„´³named³args´³seqof´³atom³String„„„„³DaemonProcessSpec´³orµµ±simple´³refµ„³CommandLine„„µ±oneShot´³rec´³lit³one-shot„´³tupleµ´³named³setup´³refµ„³CommandLine„„„„„„µ±full´³refµ„³FullDaemonProcess„„„„³FullDaemonProcess´³andµ´³named³process´³refµ„³FullProcess„„´³named³readyOnStart´³refµ„³ReadyOnStart„„´³named³restart´³refµ„³RestartField„„´³named³protocol´³refµ„³
ProtocolField„„„„„³embeddedType´³refµ³	EntityRef„³Cap„„„µ³internalServices„´³schema·³version°

³definitions·³	ConfigEnv´³dictof´³atom³Symbol„³any„³DebtReporter´³rec´³lit³
debt-reporter„´³tupleµ´³named³intervalSeconds´³atom³Double„„„„„³
ConfigWatcher´³rec´³lit³config-watcher„´³tupleµ´³named³path´³atom³String„„´³named³env´³refµ„³	ConfigEnv„„„„„³TcpRelayListener´³rec´³lit³relay-listener„´³tupleµ´³named³addr´³refµ³TransportAddress„³Tcp„„´³named³
 gatekeeper´³embedded´³refµ³
-gatekeeper„³Resolve„„„´³named³httpd´³embedded´³refµ³http„³HttpContext„„„„„„³DebtReporter´³rec´³lit³
debt-reporter„´³tupleµ´³named³intervalSeconds´³atom³Double„„„„„³
ConfigWatcher´³rec´³lit³config-watcher„´³tupleµ´³named³path´³atom³String„„´³named³env´³refµ„³	ConfigEnv„„„„„³TcpWithoutHttp´³rec´³lit³relay-listener„´³tupleµ´³named³addr´³refµ³TransportAddress„³Tcp„„´³named³
+gatekeeper„³Resolve„„„„„„³UnixRelayListener´³rec´³lit³relay-listener„´³tupleµ´³named³addr´³refµ³TransportAddress„³Unix„„´³named³
 gatekeeper´³embedded´³refµ³
-gatekeeper„³Resolve„„„„„„³TcpRelayListener´³orµµ±TcpWithoutHttp´³refµ„³TcpWithoutHttp„„µ±TcpWithHttp´³refµ„³TcpWithHttp„„„„³UnixRelayListener´³rec´³lit³relay-listener„´³tupleµ´³named³addr´³refµ³TransportAddress„³Unix„„´³named³
-gatekeeper´³embedded´³refµ³
-gatekeeper„³Resolve„„„„„„³HttpStaticFileServer´³rec´³lit³http-static-files„´³tupleµ´³named³dir´³atom³String„„´³named³pathPrefixElements´³atom³
SignedInteger„„„„„„³embeddedType´³refµ³	EntityRef„³Cap„„„„„
+gatekeeper„³Resolve„„„„„„„³embeddedType´³refµ³	EntityRef„³Cap„„„„„

syndicate-server/protocols/schemas/control.prs

@@ -1,12 +0,0 @@
-version 1 .
-
-# Messages and assertions relating to the `$control` entity enabled in syndicate-server when
-# the `--control` flag is supplied.
-#
-# For example, placing the following into `control-config.pr` and starting the server with
-# `syndicate-server --control -c control-config.pr` will result in the server exiting with
-# exit code 2:
-#
-#     $control ! <exit 2>
-
-ExitServer = <exit @code int> .

syndicate-server/protocols/schemas/internalServices.prs

@@ -1,18 +1,10 @@
 version 1 .
 embeddedType EntityRef.Cap .
 
-Gatekeeper = <gatekeeper @bindspace #:gatekeeper.Bind> .
-
 DebtReporter = <debt-reporter @intervalSeconds double>.
 
-TcpRelayListener = TcpWithoutHttp / TcpWithHttp .
-TcpWithoutHttp = <relay-listener @addr TransportAddress.Tcp @gatekeeper #:gatekeeper.Resolve> .
-TcpWithHttp = <relay-listener @addr TransportAddress.Tcp @gatekeeper #:gatekeeper.Resolve @httpd #:http.HttpContext> .
-
-UnixRelayListener = <relay-listener @addr TransportAddress.Unix @gatekeeper #:gatekeeper.Resolve> .
+TcpRelayListener = <relay-listener @addr TransportAddress.Tcp @gatekeeper #!gatekeeper.Resolve> .
+UnixRelayListener = <relay-listener @addr TransportAddress.Unix @gatekeeper #!gatekeeper.Resolve> .
 ConfigWatcher = <config-watcher @path string @env ConfigEnv>.
 
 ConfigEnv = { symbol: any ...:... }.
-
-HttpRouter = <http-router @httpd #:any> .
-HttpStaticFileServer = <http-static-files @dir string @pathPrefixElements int> .

syndicate-server/src/gatekeeper.rs

@@ -15,7 +15,7 @@ use std::convert::TryInto;
 use std::sync::Arc;
 
 use syndicate::actor::*;
-use syndicate::enclose;
+use syndicate::during::DuringResult;
 use syndicate::value::NestedValue;
 use syndicate::schemas::dataspace;
 use syndicate::schemas::gatekeeper;
@@ -102,78 +102,49 @@ pub fn handle_binds(t: &mut Activation, ds: &Arc<Cap>) -> ActorResult {
     Ok(())
 }
 
-pub fn facet_handle_resolve(
+fn eventually_retract<E>(h: Option<Handle>) -> DuringResult<E> {
+    if let Some(h) = h {
+        Ok(Some(Box::new(move |_state, t: &mut Activation| Ok(t.retract(h)))))
+    } else {
+        Ok(None)
+    }
+}
+
+pub fn handle_resolves(
     ds: &mut Arc<Cap>,
     t: &mut Activation,
     a: gatekeeper::Resolve,
-) -> ActorResult {
+) -> DuringResult<Arc<Cap>> {
     let mut detail: &'static str = "unsupported";
 
     if a.step.step_type == sturdy_step_type() {
         detail = "invalid";
         if let Ok(s) = language().parse::<sturdy::SturdyStepDetail>(&a.step.detail) {
-            t.facet(|t| {
-                let f = handle_direct_resolution(ds, t, a.clone())?;
-                await_bind_sturdyref(ds, t, sturdy::SturdyRef { parameters: s.0 }, a.observer, f)
-            })?;
-            return Ok(());
+            return handle_resolve_sturdyref(ds, t, sturdy::SturdyRef { parameters: s.0 }, a.observer);
         }
     }
 
     if a.step.step_type == noise_step_type() {
         detail = "invalid";
         if let Ok(s) = language().parse::<noise::NoiseStepDetail<AnyValue>>(&a.step.detail) {
-            t.facet(|t| {
-                let f = handle_direct_resolution(ds, t, a.clone())?;
-                await_bind_noise(ds, t, s.0.0, a.observer, f)
-            })?;
-            return Ok(());
+            return handle_resolve_noise(ds, t, s.0.0, a.observer);
         }
     }
 
-    a.observer.assert(t, language(), &gatekeeper::Rejected {
+    eventually_retract(ds.assert(t, language(), &gatekeeper::Rejected {
         detail: AnyValue::symbol(detail),
-    });
-
-    Ok(())
+    }))
 }
 
-fn handle_direct_resolution(
-    ds: &mut Arc<Cap>,
-    t: &mut Activation,
-    a: gatekeeper::Resolve,
-) -> Result<FacetId, ActorError> {
-    let outer_facet = t.facet_id();
-    t.facet(move |t| {
-        let handler = syndicate::entity(a.observer)
-            .on_asserted(move |observer, t, a: AnyValue| {
-                t.stop_facet_and_continue(outer_facet, Some(
-                    enclose!((observer, a) move |t: &mut Activation| {
-                        observer.assert(t, language(), &a);
-                        Ok(())
-                    })))?;
-                Ok(None)
-            })
-            .create_cap(t);
-        ds.assert(t, language(), &gatekeeper::Resolve {
-            step: a.step.clone(),
-            observer: handler,
-        });
-        Ok(())
-    })
-}
-
-fn await_bind_sturdyref(
+fn handle_resolve_sturdyref(
     ds: &mut Arc<Cap>,
     t: &mut Activation,
     sturdyref: sturdy::SturdyRef,
     observer: Arc<Cap>,
-    direct_resolution_facet: FacetId,
-) -> ActorResult {
+) -> DuringResult<Arc<Cap>> {
     let queried_oid = sturdyref.parameters.oid.clone();
     let handler = syndicate::entity(observer)
         .on_asserted(move |observer, t, a: AnyValue| {
-            t.stop_facet(direct_resolution_facet);
             let bindings = a.value().to_sequence()?;
             let key = bindings[0].value().to_bytestring()?;
             let unattenuated_target = bindings[1].value().to_embedded()?;
@@ -181,29 +152,27 @@ fn await_bind_sturdyref(
                 Err(e) => {
                     tracing::warn!(sturdyref = ?language().unparse(&sturdyref),
                                    "sturdyref failed validation: {}", e);
-                    observer.assert(t, language(), &gatekeeper::Resolved::Rejected(
+                    eventually_retract(observer.assert(t, language(), &gatekeeper::Resolved::Rejected(
                         Box::new(gatekeeper::Rejected {
                             detail: AnyValue::symbol("sturdyref-failed-validation"),
-                        })));
+                        }))))
                 },
                 Ok(target) => {
                     tracing::trace!(sturdyref = ?language().unparse(&sturdyref),
                                     ?target,
                                     "sturdyref resolved");
-                    observer.assert(t, language(), &gatekeeper::Resolved::Accepted {
+                    eventually_retract(observer.assert(t, language(), &gatekeeper::Resolved::Accepted {
                         responder_session: target,
-                    });
+                    }))
                 }
             }
-            Ok(None)
         })
         .create_cap(t);
-    ds.assert(t, language(), &dataspace::Observe {
+    eventually_retract(ds.assert(t, language(), &dataspace::Observe {
         // TODO: codegen plugin to generate pattern constructors
         pattern: pattern!{<bind <ref { oid: #(&queried_oid), key: $ }> $ _>},
         observer: handler,
-    });
-    Ok(())
+    }))
 }
 
 struct ValidatedNoiseSpec {
@@ -263,80 +232,52 @@ fn validate_noise_spec(
     })
 }
 
-fn await_bind_noise(
+fn handle_resolve_noise(
     ds: &mut Arc<Cap>,
     t: &mut Activation,
     service_selector: AnyValue,
-    observer: Arc<Cap>,
-    direct_resolution_facet: FacetId,
-) -> ActorResult {
+    initiator_session: Arc<Cap>,
+) -> DuringResult<Arc<Cap>> {
     let handler = syndicate::entity(())
         .on_asserted_facet(move |_state, t, a: AnyValue| {
-            t.stop_facet(direct_resolution_facet);
-            let observer = Arc::clone(&observer);
+            let initiator_session = Arc::clone(&initiator_session);
             t.spawn_link(None, move |t| {
                 let bindings = a.value().to_sequence()?;
                 let spec = validate_noise_spec(language().parse(&bindings[0])?)?;
                 let service = bindings[1].value().to_embedded()?;
-                run_noise_responder(t, spec, observer, Arc::clone(service))
+                run_noise_responder(t, spec, initiator_session, Arc::clone(service))
             });
             Ok(())
         })
         .create_cap(t);
-    ds.assert(t, language(), &dataspace::Observe {
+    eventually_retract(ds.assert(t, language(), &dataspace::Observe {
         // TODO: codegen plugin to generate pattern constructors
         pattern: pattern!{
             <bind <noise $spec:NoiseServiceSpec{ { service: #(&service_selector) } }> $service _>
         },
         observer: handler,
-    });
-    Ok(())
+    }))
 }
 
-type HandshakeState = noise_protocol::HandshakeState<X25519, ChaCha20Poly1305, Blake2s>;
+struct ResponderDetails {
+    initiator_session: Arc<Cap>,
+    service: Arc<Cap>,
+}
+
+struct ResponderTransport {
+    relay_input: Arc<Mutex<Option<TunnelRelay>>>,
+    c_recv: CipherState<ChaCha20Poly1305>
+}
 
 enum ResponderState {
-    Invalid, // used during state transitions
-    Introduction {
-        service: Arc<Cap>,
-        hs: HandshakeState,
-    },
-    Handshake {
-        initiator_session: Arc<Cap>,
-        service: Arc<Cap>,
-        hs: HandshakeState,
-    },
-    Transport {
-        relay_input: Arc<Mutex<Option<TunnelRelay>>>,
-        c_recv: CipherState<ChaCha20Poly1305>,
-    },
+    Handshake(ResponderDetails, noise_protocol::HandshakeState<X25519, ChaCha20Poly1305, Blake2s>),
+    Transport(ResponderTransport),
 }
 
-impl Entity<noise::SessionItem> for ResponderState {
-    fn assert(&mut self, _t: &mut Activation, item: noise::SessionItem, _handle: Handle) -> ActorResult {
-        let initiator_session = match item {
-            noise::SessionItem::Initiator(i_box) => i_box.initiator_session,
-            noise::SessionItem::Packet(_) => Err("Unexpected Packet assertion")?,
-        };
-        match std::mem::replace(self, ResponderState::Invalid) {
-            ResponderState::Introduction { service, hs } => {
-                *self = ResponderState::Handshake { initiator_session, service, hs };
-                Ok(())
-            }
-            _ =>
-                Err("Received second Initiator")?,
-        }
-    }
-
-    fn message(&mut self, t: &mut Activation, item: noise::SessionItem) -> ActorResult {
-        let p = match item {
-            noise::SessionItem::Initiator(_) => Err("Unexpected Initiator message")?,
-            noise::SessionItem::Packet(p_box) => *p_box,
-        };
+impl Entity<noise::Packet> for ResponderState {
+    fn message(&mut self, t: &mut Activation, p: noise::Packet) -> ActorResult {
         match self {
-            ResponderState::Invalid | ResponderState::Introduction { .. } =>
-                Err("Received Packet in invalid ResponderState")?,
-            ResponderState::Handshake { initiator_session, service, hs } => match p {
+            ResponderState::Handshake(details, hs) => match p {
                 noise::Packet::Complete(bs) => {
                     if bs.len() < hs.get_next_message_overhead() {
                         Err("Invalid handshake message for pattern")?;
@@ -347,15 +288,16 @@ impl Entity<noise::SessionItem> for ResponderState {
                     hs.read_message(&bs, &mut [])?;
                     let mut reply = vec![0u8; hs.get_next_message_overhead()];
                     hs.write_message(&[], &mut reply[..])?;
-                    initiator_session.message(t, language(), &noise::Packet::Complete(reply.into()));
+                    details.initiator_session.message(t, language(), &noise::Packet::Complete(reply.into()));
                     if hs.completed() {
                         let (c_recv, mut c_send) = hs.get_ciphers();
                         let (_, relay_input, mut relay_output) =
-                            TunnelRelay::_run(t, Some(Arc::clone(service)), None, false);
+                            TunnelRelay::_run(t, Some(Arc::clone(&details.service)), None, false);
                         let trace_collector = t.trace_collector();
-                        let initiator_session = Arc::clone(initiator_session);
+                        let transport = ResponderTransport { relay_input, c_recv };
+                        let initiator_session = Arc::clone(&details.initiator_session);
                         let relay_output_name = Some(AnyValue::symbol("relay_output"));
-                        let transport_facet = t.facet_ref();
+                        let transport_facet = t.facet.clone();
                         t.linked_task(relay_output_name.clone(), async move {
                             let account = Account::new(relay_output_name, trace_collector);
                             let cause = TurnCause::external("relay_output");
@@ -384,25 +326,25 @@ impl Entity<noise::SessionItem> for ResponderState {
                             }
                             Ok(LinkedTaskTermination::Normal)
                         });
-                        *self = ResponderState::Transport { relay_input, c_recv };
+                        *self = ResponderState::Transport(transport);
                     }
                 }
                 _ => Err("Fragmented handshake is not allowed")?,
             },
-            ResponderState::Transport { relay_input, c_recv } => {
+            ResponderState::Transport(transport) => {
                 let bs = match p {
                     noise::Packet::Complete(bs) =>
-                        c_recv.decrypt_vec(&bs[..]).map_err(|_| "Cannot decrypt packet")?,
+                        transport.c_recv.decrypt_vec(&bs[..]).map_err(|_| "Cannot decrypt packet")?,
                     noise::Packet::Fragmented(pieces) => {
                         let mut result = Vec::with_capacity(1024);
                         for piece in pieces {
-                            result.extend(c_recv.decrypt_vec(&piece[..])
+                            result.extend(transport.c_recv.decrypt_vec(&piece[..])
                                 .map_err(|_| "Cannot decrypt packet fragment")?);
                         }
                         result
                     }
                 };
-                let mut g = relay_input.lock();
+                let mut g = transport.relay_input.lock();
                 let tr = g.as_mut().expect("initialized");
                 tr.handle_inbound_datagram(t, &bs[..])?;
             }
@@ -470,7 +412,7 @@ fn lookup_pattern(name: &str) -> Option<HandshakePattern> {
 fn run_noise_responder(
     t: &mut Activation,
     spec: ValidatedNoiseSpec,
-    observer: Arc<Cap>,
+    initiator_session: Arc<Cap>,
     service: Arc<Cap>,
 ) -> ActorResult {
     let hs = {
@@ -493,8 +435,13 @@ fn run_noise_responder(
         hs
     };
 
+    let details = ResponderDetails {
+        initiator_session: initiator_session.clone(),
+        service,
+    };
+
     let responder_session =
-        Cap::guard(crate::Language::arc(), t.create(ResponderState::Introduction{ service, hs }));
-    observer.assert(t, language(), &gatekeeper::Resolved::Accepted { responder_session });
+        Cap::guard(crate::Language::arc(), t.create(ResponderState::Handshake(details, hs)));
+    initiator_session.assert(t, language(), &gatekeeper::Resolved::Accepted { responder_session });
     Ok(())
 }

syndicate-server/src/http.rs

@@ -1,195 +0,0 @@
-use std::convert::TryInto;
-use std::sync::Arc;
-use std::sync::atomic::AtomicU64;
-use std::sync::atomic::Ordering;
-
-use hyper::{Request, Response, Body, StatusCode};
-use hyper::body;
-use hyper::header::HeaderName;
-use hyper::header::HeaderValue;
-
-use syndicate::actor::*;
-use syndicate::error::Error;
-use syndicate::trace;
-use syndicate::value::Map;
-use syndicate::value::NestedValue;
-
-use syndicate::schemas::http;
-
-use tokio::sync::oneshot;
-use tokio::sync::mpsc::{UnboundedSender, unbounded_channel};
-use tokio_stream::wrappers::UnboundedReceiverStream;
-
-use crate::language;
-
-static NEXT_SEQ: AtomicU64 = AtomicU64::new(0);
-
-pub fn empty_response(code: StatusCode) -> Response<Body> {
-    let mut r = Response::new(Body::empty());
-    *r.status_mut() = code;
-    r
-}
-
-type ChunkItem = Result<body::Bytes, Box<dyn std::error::Error + Send + Sync>>;
-
-struct ResponseCollector {
-    tx_res: Option<(oneshot::Sender<Response<Body>>, Response<Body>)>,
-    body_tx: Option<UnboundedSender<ChunkItem>>,
-}
-
-impl ResponseCollector {
-    fn new(tx: oneshot::Sender<Response<Body>>) -> Self {
-        let (body_tx, body_rx) = unbounded_channel();
-        let body_stream: Box<dyn futures::Stream<Item = ChunkItem> + Send> =
-            Box::new(UnboundedReceiverStream::new(body_rx));
-        let mut res = Response::new(body_stream.into());
-        *res.status_mut() = StatusCode::OK;
-        ResponseCollector {
-            tx_res: Some((tx, res)),
-            body_tx: Some(body_tx),
-        }
-    }
-
-    fn with_res<F: FnOnce(&mut Response<Body>) -> ActorResult>(&mut self, f: F) -> ActorResult {
-        if let Some((_, res)) = &mut self.tx_res {
-            f(res)?;
-        }
-        Ok(())
-    }
-
-    fn deliver_res(&mut self) {
-        if let Some((tx, res)) = std::mem::replace(&mut self.tx_res, None) {
-            let _ = tx.send(res);
-        }
-    }
-
-    fn add_chunk(&mut self, value: http::Chunk) -> ActorResult {
-        self.deliver_res();
-
-        if let Some(body_tx) = self.body_tx.as_mut() {
-            body_tx.send(Ok(match value {
-                http::Chunk::Bytes(bs) => bs.into(),
-                http::Chunk::String(s) => s.as_bytes().to_vec().into(),
-            }))?;
-        }
-
-        Ok(())
-    }
-
-    fn finish(&mut self, t: &mut Activation) -> ActorResult {
-        self.deliver_res();
-        self.body_tx = None;
-        t.stop();
-        Ok(())
-    }
-}
-
-impl Entity<http::HttpResponse> for ResponseCollector {
-    fn message(&mut self, t: &mut Activation, message: http::HttpResponse) -> ActorResult {
-        match message {
-            http::HttpResponse::Status { code, .. } => self.with_res(|r| {
-                *r.status_mut() = StatusCode::from_u16(
-                    (&code).try_into().map_err(|_| "bad status code")?)?;
-                Ok(())
-            }),
-            http::HttpResponse::Header { name, value } => self.with_res(|r| {
-                r.headers_mut().insert(HeaderName::from_bytes(name.as_bytes())?,
-                                       HeaderValue::from_str(value.as_str())?);
-                Ok(())
-            }),
-            http::HttpResponse::Chunk { chunk } => {
-                self.add_chunk(*chunk)
-            }
-            http::HttpResponse::Done { chunk } => {
-                self.add_chunk(*chunk)?;
-                self.finish(t)
-            }
-        }
-    }
-}
-
-pub async fn serve(
-    trace_collector: Option<trace::TraceCollector>,
-    facet: FacetRef,
-    httpd: Arc<Cap>,
-    mut req: Request<Body>,
-    port: u16,
-) -> Result<Response<Body>, Error> {
-    let host = match req.headers().get("host").and_then(|v| v.to_str().ok()) {
-        None => http::RequestHost::Absent,
-        Some(h) => http::RequestHost::Present(match h.rsplit_once(':') {
-            None => h.to_string(),
-            Some((h, _port)) => h.to_string(),
-        })
-    };
-
-    let uri = req.uri();
-    let mut path: Vec<String> = uri.path().split('/').map(|s| s.to_string()).collect();
-    path.remove(0);
-
-    let mut query: Map<String, Vec<http::QueryValue>> = Map::new();
-    for piece in uri.query().unwrap_or("").split('&').into_iter() {
-        match piece.split_once('=') {
-            Some((k, v)) => {
-                let key = k.to_string();
-                let value = v.to_string();
-                match query.get_mut(&key) {
-                    None => { query.insert(key, vec![http::QueryValue::String(value)]); },
-                    Some(vs) => { vs.push(http::QueryValue::String(value)); },
-                }
-            }
-            None => {
-                if piece.len() > 0 {
-                    let key = piece.to_string();
-                    if !query.contains_key(&key) {
-                        query.insert(key, vec![]);
-                    }
-                }
-            }
-        }
-    }
-
-    let mut headers: Map<String, String> = Map::new();
-    for h in req.headers().into_iter() {
-        match h.1.to_str() {
-            Ok(v) => { headers.insert(h.0.as_str().to_string().to_lowercase(), v.to_string()); },
-            Err(_) => return Ok(empty_response(StatusCode::BAD_REQUEST)),
-        }
-    }
-
-    let body = match body::to_bytes(req.body_mut()).await {
-        Ok(b) => http::RequestBody::Present(b.to_vec()),
-        Err(_) => return Ok(empty_response(StatusCode::BAD_REQUEST)),
-    };
-
-    let account = Account::new(Some(AnyValue::symbol("http")), trace_collector);
-
-    let (tx, rx) = oneshot::channel();
-
-    facet.activate(&account, Some(trace::TurnCause::external("http")), |t| {
-        t.facet(move |t| {
-            let sreq = http::HttpRequest {
-                sequence_number: NEXT_SEQ.fetch_add(1, Ordering::Relaxed).into(),
-                host,
-                port: port.into(),
-                method: req.method().to_string().to_lowercase(),
-                path,
-                headers: http::Headers(headers),
-                query,
-                body,
-            };
-            tracing::debug!(?sreq);
-            let srep = Cap::guard(&language().syndicate, t.create(ResponseCollector::new(tx)));
-            httpd.assert(t, language(), &http::HttpContext { req: sreq, res: srep });
-            Ok(())
-        })?;
-        Ok(())
-    });
-
-    let response_result = rx.await;
-
-    match response_result {
-        Ok(response) => Ok(response),
-        Err(_ /* sender dropped */) => Ok(empty_response(StatusCode::INTERNAL_SERVER_ERROR)),
-    }
-}

syndicate-server/src/main.rs

@@ -1,6 +1,5 @@
 use preserves_schema::Codec;
 
-use std::convert::TryInto;
 use std::io;
 use std::path::PathBuf;
 use std::sync::Arc;
@@ -21,7 +20,6 @@ use syndicate::value::NestedValue;
 mod counter;
 mod dependencies;
 mod gatekeeper;
-mod http;
 mod language;
 mod lifecycle;
 mod protocol;
@@ -62,10 +60,6 @@ struct ServerConfig {
 
     #[structopt(short = "t", long)]
     trace_file: Option<PathBuf>,
-
-    /// Enable `$control` entity.
-    #[structopt(long)]
-    control: bool,
 }
 
 #[tokio::main]
@@ -120,7 +114,7 @@ async fn main() -> ActorResult {
 
         let gatekeeper = Cap::guard(Language::arc(), t.create(
             syndicate::entity(Arc::clone(&server_config_ds))
-                .on_asserted_facet(gatekeeper::facet_handle_resolve)));
+                .on_asserted(gatekeeper::handle_resolves)));
         gatekeeper::handle_binds(t, &server_config_ds)?;
 
         let mut env = Map::new();
@@ -128,26 +122,10 @@ async fn main() -> ActorResult {
         env.insert("log".to_owned(), AnyValue::domain(Arc::clone(&log_ds)));
         env.insert("gatekeeper".to_owned(), AnyValue::domain(Arc::clone(&gatekeeper)));
 
-        if config.control {
-            env.insert("control".to_owned(), AnyValue::domain(Cap::guard(Language::arc(), t.create(
-                syndicate::entity(())
-                    .on_message(|_, _t, m: crate::schemas::control::ExitServer| {
-                        tracing::info!("$control received exit request with code {}", m.code);
-                        std::process::exit((&m.code).try_into().unwrap_or_else(|_| {
-                            tracing::warn!(
-                                "exit code {} out-of-range of 32-bit signed integer, using 1 instead",
-                                m.code);
-                            1
-                        }))
-                    })))));
-        }
-
         dependencies::boot(t, Arc::clone(&server_config_ds));
         services::config_watcher::on_demand(t, Arc::clone(&server_config_ds));
         services::daemon::on_demand(t, Arc::clone(&server_config_ds), Arc::clone(&log_ds));
         services::debt_reporter::on_demand(t, Arc::clone(&server_config_ds));
-        services::gatekeeper::on_demand(t, Arc::clone(&server_config_ds));
-        services::http_router::on_demand(t, Arc::clone(&server_config_ds));
         services::tcp_relay_listener::on_demand(t, Arc::clone(&server_config_ds));
         services::unix_relay_listener::on_demand(t, Arc::clone(&server_config_ds));
 
@@ -161,7 +139,7 @@ async fn main() -> ActorResult {
 
         for port in config.ports.clone() {
             server_config_ds.assert(t, language(), &service::RunService {
-                service_name: language().unparse(&internal_services::TcpWithoutHttp {
+                service_name: language().unparse(&internal_services::TcpRelayListener {
                     addr: transport_address::Tcp {
                         host: "0.0.0.0".to_owned(),
                         port: (port as i32).into(),
@@ -235,7 +213,7 @@ async fn main() -> ActorResult {
         }));
 
         Ok(())
-    }).await??;
+    }).await?;
 
     wait_for_all_actors_to_stop(std::time::Duration::from_secs(2)).await;
 

syndicate-server/src/protocol.rs

@@ -1,15 +1,11 @@
 use futures::SinkExt;
 use futures::StreamExt;
-use hyper::header::HeaderValue;
-use hyper::service::service_fn;
 
 use std::future::ready;
+use std::io;
 use std::sync::Arc;
-use std::sync::atomic::AtomicBool;
-use std::sync::atomic::Ordering;
 
 use syndicate::actor::*;
-use syndicate::enclose;
 use syndicate::error::Error;
 use syndicate::error::error;
 use syndicate::relay;
@@ -18,7 +14,7 @@ use syndicate::value::NestedValue;
 
 use tokio::net::TcpStream;
 
-use hyper_tungstenite::tungstenite::Message;
+use tungstenite::Message;
 
 struct ExitListener;
 
@@ -35,7 +31,7 @@ pub fn run_io_relay(
     initial_ref: Arc<Cap>,
 ) -> ActorResult {
     let exit_listener = t.create(ExitListener);
-    t.add_exit_hook(&exit_listener);
+    t.state.add_exit_hook(&exit_listener);
     relay::TunnelRelay::run(t, i, o, Some(initial_ref), None, false);
     Ok(())
 }
@@ -57,75 +53,34 @@ pub async fn detect_protocol(
     facet: FacetRef,
     stream: TcpStream,
     gateway: Arc<Cap>,
-    httpd: Option<Arc<Cap>>,
     addr: std::net::SocketAddr,
-    server_port: u16,
 ) -> ActorResult {
-    let mut buf = [0; 1]; // peek at the first byte to see what kind of connection to expect
-    match stream.peek(&mut buf).await? {
-        1 => match buf[0] {
-            v if v == b'[' /* Turn */ || v == b'<' /* Error and Extension */ || v >= 128 => {
-                tracing::info!(protocol = %(if v >= 128 { "application/syndicate" } else { "text/syndicate" }), peer = ?addr);
-                let (i, o) = stream.into_split();
-                let i = relay::Input::Bytes(Box::pin(i));
-                let o = relay::Output::Bytes(Box::pin(o /* BufWriter::new(o) */));
-                run_connection(trace_collector, facet, i, o, gateway);
-                Ok(())
-            }
-            _ => {
-                let upgraded = Arc::new(AtomicBool::new(false));
-                let keepalive = facet.actor.keep_alive();
-                let mut http = hyper::server::conn::Http::new();
-                http.http1_keep_alive(true);
-                http.http1_only(true);
-                let service = service_fn(|mut req| enclose!(
-                    (upgraded, keepalive, trace_collector, facet, gateway, httpd) async move {
-                        if hyper_tungstenite::is_upgrade_request(&req) {
-                            tracing::info!(protocol = %"websocket",
-                                           method=%req.method(),
-                                           uri=?req.uri(),
-                                           host=?req.headers().get("host").unwrap_or(&HeaderValue::from_static("")));
-                            let (response, websocket) = hyper_tungstenite::upgrade(&mut req, None)
-                                .map_err(|e| message_error(e))?;
-                            upgraded.store(true, Ordering::SeqCst);
-                            tokio::spawn(enclose!(() async move {
-                                let (o, i) = websocket.await?.split();
-                                let i = i.filter_map(|r| ready(extract_binary_packets(r).transpose()));
-                                let o = o.sink_map_err(message_error).with(|bs| ready(Ok(Message::Binary(bs))));
-                                let i = relay::Input::Packets(Box::pin(i));
-                                let o = relay::Output::Packets(Box::pin(o));
-                                run_connection(trace_collector, facet, i, o, gateway);
-                                drop(keepalive);
-                                Ok(()) as ActorResult
-                            }));
-                            Ok(response)
-                        } else {
-                            match httpd {
-                                None => Ok(crate::http::empty_response(
-                                    hyper::StatusCode::SERVICE_UNAVAILABLE)),
-                                Some(httpd) => {
-                                    tracing::info!(protocol = %"http",
-                                                   method=%req.method(),
-                                                   uri=?req.uri(),
-                                                   host=?req.headers().get("host").unwrap_or(&HeaderValue::from_static("")));
-                                    crate::http::serve(trace_collector, facet, httpd, req, server_port).await
-                                }
-                            }
-                        }
-                    }));
-                http.serve_connection(stream, service).with_upgrades().await?;
-                if upgraded.load(Ordering::SeqCst) {
-                    tracing::debug!("serve_connection completed after upgrade to websocket");
-                } else {
-                    tracing::debug!("serve_connection completed after regular HTTP session");
-                    facet.activate(&Account::new(None, None), None, |t| Ok(t.stop()));
+    let (i, o) = {
+        let mut buf = [0; 1]; // peek at the first byte to see what kind of connection to expect
+        match stream.peek(&mut buf).await? {
+            1 => match buf[0] {
+                b'G' /* ASCII 'G' for "GET" */ => {
+                    tracing::info!(protocol = %"websocket", peer = ?addr);
+                    let s = tokio_tungstenite::accept_async(stream).await
+                        .map_err(|e| io::Error::new(io::ErrorKind::Other, e))?;
+                    let (o, i) = s.split();
+                    let i = i.filter_map(|r| ready(extract_binary_packets(r).transpose()));
+                    let o = o.sink_map_err(message_error).with(|bs| ready(Ok(Message::Binary(bs))));
+                    (relay::Input::Packets(Box::pin(i)), relay::Output::Packets(Box::pin(o)))
+                },
+                _ => {
+                    tracing::info!(protocol = %"raw", peer = ?addr);
+                    let (i, o) = stream.into_split();
+                    (relay::Input::Bytes(Box::pin(i)),
+                     relay::Output::Bytes(Box::pin(o /* BufWriter::new(o) */)))
                 }
-                Ok(())
-            },
+            }
+            0 => Err(error("closed before starting", AnyValue::new(false)))?,
+            _ => unreachable!()
         }
-        0 => Err(error("closed before starting", AnyValue::new(false)))?,
-        _ => unreachable!()
-    }
+    };
+    run_connection(trace_collector, facet, i, o, gateway);
+    Ok(())
 }
 
 fn message_error<E: std::fmt::Display>(e: E) -> Error {
@@ -133,7 +88,7 @@ fn message_error<E: std::fmt::Display>(e: E) -> Error {
 }
 
 fn extract_binary_packets(
-    r: Result<Message, hyper_tungstenite::tungstenite::Error>,
+    r: Result<Message, tungstenite::Error>,
 ) -> Result<Option<Vec<u8>>, Error> {
     match r {
         Ok(m) => match m {
@@ -147,8 +102,6 @@ fn extract_binary_packets(
                 Ok(None), // unsolicited pongs are to be ignored
             Message::Close(_) =>
                 Ok(None), // we're about to see the end of the stream, so ignore this
-            Message::Frame(_) =>
-                Err("Raw frames are not accepted")?,
         },
         Err(e) => Err(message_error(e)),
     }

syndicate-server/src/script/mod.rs

@@ -9,7 +9,7 @@ use syndicate::actor::*;
 use syndicate::dataspace::Dataspace;
 use syndicate::during;
 use syndicate::enclose;
-use syndicate::pattern::{lift_literal, drop_literal, pattern_seq_from_dictionary};
+use syndicate::pattern::{lift_literal, drop_literal};
 use syndicate::schemas::dataspace;
 use syndicate::schemas::dataspace_patterns as P;
 use syndicate::schemas::sturdy;
@@ -173,7 +173,7 @@ fn bad_instruction(message: &str) -> io::Error {
 }
 
 fn discard() -> P::Pattern {
-    P::Pattern::Discard
+    P::Pattern::DDiscard(Box::new(P::DDiscard))
 }
 
 fn dlit(value: AnyValue) -> P::Pattern {
@@ -261,6 +261,7 @@ impl<'env> PatternInstantiator<'env> {
     fn instantiate_pattern(&mut self, template: &AnyValue) -> io::Result<P::Pattern> {
         Ok(match template.value() {
             Value::Boolean(_) |
+            Value::Float(_) |
             Value::Double(_) |
             Value::SignedInteger(_) |
             Value::String(_) |
@@ -272,7 +273,7 @@ impl<'env> PatternInstantiator<'env> {
                 Symbolic::Discard => discard(),
                 Symbolic::Binder(s) => {
                     self.binding_names.push(s);
-                    P::Pattern::Bind { pattern: Box::new(discard()) }
+                    P::Pattern::DBind(Box::new(P::DBind { pattern: discard() }))
                 }
                 Symbolic::Reference(s) =>
                     dlit(self.env.lookup(&s, "pattern-template variable")?.clone()),
@@ -287,47 +288,43 @@ impl<'env> PatternInstantiator<'env> {
                     Some(pat) => pat,
                     None => {
                         let label = self.instantiate_pattern(r.label())?;
-                        let entries = r.fields().iter().enumerate()
-                        .map(|(i, p)| Ok((AnyValue::new(i), self.instantiate_pattern(p)?)))
-                            .collect::<io::Result<Map<AnyValue, P::Pattern>>>()?;
-                        P::Pattern::Group {
-                            type_: Box::new(P::GroupType::Rec {
-                                label: drop_literal(&label)
-                                    .ok_or(bad_instruction("Record pattern must have literal label"))?,
-                            }),
-                            entries,
-                        }
+                        let fields = r.fields().iter().map(|p| self.instantiate_pattern(p))
+                            .collect::<io::Result<Vec<P::Pattern>>>()?;
+                        P::Pattern::DCompound(Box::new(P::DCompound::Rec {
+                            label: drop_literal(&label)
+                                .ok_or(bad_instruction("Record pattern must have literal label"))?,
+                            fields,
+                        }))
                     }
                 }
             },
             Value::Sequence(v) =>
-                P::Pattern::Group {
-                    type_: Box::new(P::GroupType::Arr),
-                    entries: v.iter().enumerate()
-                        .map(|(i, p)| Ok((AnyValue::new(i), self.instantiate_pattern(p)?)))
-                        .collect::<io::Result<Map<AnyValue, P::Pattern>>>()?,
-                },
+                P::Pattern::DCompound(Box::new(P::DCompound::Arr {
+                    items: v.iter()
+                        .map(|p| self.instantiate_pattern(p))
+                        .collect::<io::Result<Vec<P::Pattern>>>()?,
+                })),
             Value::Set(_) =>
                 Err(bad_instruction(&format!("Sets not permitted in patterns: {:?}", template)))?,
             Value::Dictionary(v) =>
-                P::Pattern::Group {
-                    type_: Box::new(P::GroupType::Dict),
+                P::Pattern::DCompound(Box::new(P::DCompound::Dict {
                     entries: v.iter()
                         .map(|(a, b)| Ok((a.clone(), self.instantiate_pattern(b)?)))
                         .collect::<io::Result<Map<AnyValue, P::Pattern>>>()?,
-                },
+                })),
         })
     }
 
     fn maybe_binder_with_pattern(&mut self, r: &Record<AnyValue>) -> io::Result<Option<P::Pattern>> {
         match r.label().value().as_symbol().map(|s| analyze(&s)) {
-            Some(Symbolic::Binder(formal)) if r.fields().len() == 1 => {
+            Some(Symbolic::Binder(formal)) => if r.fields().len() == 1 {
                 let pattern = self.instantiate_pattern(&r.fields()[0])?;
                 self.binding_names.push(formal);
-                Ok(Some(P::Pattern::Bind { pattern: Box::new(pattern) }))
+                return Ok(Some(P::Pattern::DBind(Box::new(P::DBind { pattern }))));
             },
-            _ => Ok(None),
+            _ => (),
         }
+        Ok(None)
     }
 }
 
@@ -375,6 +372,7 @@ impl Env {
     fn instantiate_value(&self, template: &AnyValue) -> io::Result<AnyValue> {
         Ok(match template.value() {
             Value::Boolean(_) |
+            Value::Float(_) |
             Value::Double(_) |
             Value::SignedInteger(_) |
             Value::String(_) |
@@ -557,7 +555,7 @@ impl Env {
             RewriteTemplate::Accept { pattern_template } => {
                 let (_binding_names, pattern) = self.instantiate_pattern(pattern_template)?;
                 Ok(sturdy::Rewrite {
-                    pattern: embed_pattern(&P::Pattern::Bind { pattern: Box::new(pattern) }),
+                    pattern: embed_pattern(&P::Pattern::DBind(Box::new(P::DBind { pattern }))),
                     template: sturdy::Template::TRef(Box::new(sturdy::TRef { binding: 0.into() })),
                 })
             }
@@ -607,6 +605,7 @@ impl Env {
 
         Ok(match template.value() {
             Value::Boolean(_) |
+            Value::Float(_) |
             Value::Double(_) |
             Value::SignedInteger(_) |
             Value::String(_) |
@@ -678,26 +677,24 @@ impl Env {
 
 fn embed_pattern(p: &P::Pattern) -> sturdy::Pattern {
     match p {
-        P::Pattern::Discard => sturdy::Pattern::PDiscard(Box::new(sturdy::PDiscard)),
-        P::Pattern::Bind { pattern } => sturdy::Pattern::PBind(Box::new(sturdy::PBind {
-            pattern: embed_pattern(&**pattern),
+        P::Pattern::DDiscard(_) => sturdy::Pattern::PDiscard(Box::new(sturdy::PDiscard)),
+        P::Pattern::DBind(b) => sturdy::Pattern::PBind(Box::new(sturdy::PBind {
+            pattern: embed_pattern(&b.pattern),
         })),
-        P::Pattern::Lit { value } => sturdy::Pattern::Lit(Box::new(sturdy::Lit {
-            value: language().unparse(&**value),
+        P::Pattern::DLit(b) => sturdy::Pattern::Lit(Box::new(sturdy::Lit {
+            value: language().unparse(&b.value),
         })),
-        P::Pattern::Group { type_, entries } => sturdy::Pattern::PCompound(Box::new(match &**type_ {
-            P::GroupType::Rec { label } =>
+        P::Pattern::DCompound(b) => sturdy::Pattern::PCompound(Box::new(match &**b {
+            P::DCompound::Rec { label, fields } =>
                 sturdy::PCompound::Rec {
                     label: label.clone(),
-                    fields: pattern_seq_from_dictionary(entries).expect("correct field entries")
-                        .into_iter().map(embed_pattern).collect(),
+                    fields: fields.iter().map(embed_pattern).collect(),
                 },
-            P::GroupType::Arr =>
+            P::DCompound::Arr { items } =>
                 sturdy::PCompound::Arr {
-                    items: pattern_seq_from_dictionary(entries).expect("correct element entries")
-                        .into_iter().map(embed_pattern).collect(),
+                    items: items.iter().map(embed_pattern).collect(),
                 },
-            P::GroupType::Dict =>
+            P::DCompound::Dict { entries } =>
                 sturdy::PCompound::Dict {
                     entries: entries.iter().map(|(k, v)| (k.clone(), embed_pattern(v))).collect(),
                 },

syndicate-server/src/services/config_watcher.rs

@@ -36,7 +36,7 @@ use syndicate_macros::during;
 
 pub fn on_demand(t: &mut Activation, config_ds: Arc<Cap>) {
     t.spawn(Some(AnyValue::symbol("config_watcher")), move |t| {
-        Ok(during!(t, config_ds, language(), <run-service $spec: internal_services::ConfigWatcher::<AnyValue>>, |t| {
+        Ok(during!(t, config_ds, language(), <run-service $spec: internal_services::ConfigWatcher>, |t| {
             Supervisor::start(
                 t,
                 Some(rec![AnyValue::symbol("config"), AnyValue::new(spec.path.clone())]),
@@ -184,10 +184,10 @@ fn run(
     let mut watcher = watcher(tx, Duration::from_millis(100)).map_err(convert_notify_error)?;
     watcher.watch(&env.path, RecursiveMode::Recursive).map_err(convert_notify_error)?;
 
-    let facet = t.facet_ref();
+    let facet = t.facet.clone();
     let trace_collector = t.trace_collector();
     let span = tracing::Span::current();
-    thread::spawn(move || {
+    tokio::task::spawn_blocking(move || {
         let _entry = span.enter();
 
         let mut path_state: Map<PathBuf, FacetId> = Map::new();

syndicate-server/src/services/daemon.rs

@@ -24,7 +24,7 @@ use syndicate_macros::during;
 
 pub fn on_demand(t: &mut Activation, config_ds: Arc<Cap>, root_ds: Arc<Cap>) {
     t.spawn(Some(AnyValue::symbol("daemon_listener")), move |t| {
-        Ok(during!(t, config_ds, language(), <run-service $spec: DaemonService::<AnyValue>>,
+        Ok(during!(t, config_ds, language(), <run-service $spec: DaemonService>,
                    enclose!((config_ds, root_ds) move |t: &mut Activation| {
                        supervise_daemon(t, config_ds, root_ds, spec)
                    })))
@@ -41,7 +41,7 @@ fn supervise_daemon(
         lifecycle::on_service_restart(t, &config_ds, &spec, enclose!(
             (config_ds, root_ds, spec) move |t| {
                 tracing::info!(id = ?spec.id, "Terminating to restart");
-                t.stop_facet_and_continue(t.facet_id(), Some(
+                t.stop_facet_and_continue(t.facet.facet_id, Some(
                     enclose!((config_ds, root_ds, spec) move |t: &mut Activation| {
                         supervise_daemon(t, config_ds, root_ds, spec)
                     })))
@@ -176,7 +176,7 @@ impl DaemonInstance {
     fn handle_exit(self, t: &mut Activation, error_message: Option<String>) -> ActorResult {
         let delay =
             std::time::Duration::from_millis(if let None = error_message { 200 } else { 1000 });
-        t.stop_facet_and_continue(t.facet_id(), Some(move |t: &mut Activation| {
+        t.stop_facet_and_continue(t.facet.facet_id, Some(move |t: &mut Activation| {
             #[derive(Debug)]
             enum NextStep {
                 SleepAndRestart,
@@ -230,7 +230,7 @@ impl DaemonInstance {
         kind: &str
     ) -> ActorResult {
         t.facet(|t| {
-            let facet = t.facet_ref();
+            let facet = t.facet.clone();
             let log_ds = self.log_ds.clone();
             let service = self.service.clone();
             let kind = AnyValue::symbol(kind);
@@ -290,7 +290,7 @@ impl DaemonInstance {
             let pid = child.id();
             tracing::debug!(?pid, cmd = ?self.cmd, "started");
 
-            let facet = t.facet_ref();
+            let facet = t.facet.clone();
 
             if let Some(r) = child.stderr.take() {
                 self.log(t, pid, r, "stderr")?;
@@ -401,7 +401,7 @@ fn run(
                                   Ok(config) => {
                                       tracing::info!(?config);
                                       let config = config.elaborate();
-                                      let facet = t.facet_ref();
+                                      let facet = t.facet.clone();
                                       t.linked_task(Some(AnyValue::symbol("subprocess")), async move {
                                           let mut cmd = config.process.build_command().ok_or("Cannot start daemon process")?;
 

syndicate-server/src/services/gatekeeper.rs

@@ -1,39 +0,0 @@
-use preserves_schema::Codec;
-
-use std::sync::Arc;
-
-use syndicate::actor::*;
-use syndicate::enclose;
-use syndicate::preserves::rec;
-use syndicate::preserves::value::NestedValue;
-
-use crate::gatekeeper;
-use crate::language::Language;
-use crate::language::language;
-use crate::lifecycle;
-use crate::schemas::internal_services::Gatekeeper;
-
-use syndicate_macros::during;
-
-pub fn on_demand(t: &mut Activation, ds: Arc<Cap>) {
-    t.spawn(Some(AnyValue::symbol("gatekeeper_listener")), move |t| {
-        Ok(during!(t, ds, language(), <run-service $spec: Gatekeeper::<AnyValue>>, |t: &mut Activation| {
-            t.spawn_link(Some(rec![AnyValue::symbol("gatekeeper"), language().unparse(&spec)]),
-                         enclose!((ds) |t| run(t, ds, spec)));
-            Ok(())
-        }))
-    });
-}
-
-fn run(t: &mut Activation, ds: Arc<Cap>, spec: Gatekeeper<AnyValue>) -> ActorResult {
-    let resolver = t.create(syndicate::entity(Arc::clone(&spec.bindspace))
-                            .on_asserted_facet(gatekeeper::facet_handle_resolve));
-    ds.assert(t, language(), &syndicate::schemas::service::ServiceObject {
-        service_name: language().unparse(&spec),
-        object: AnyValue::domain(Cap::guard(Language::arc(), resolver)),
-    });
-    gatekeeper::handle_binds(t, &spec.bindspace)?;
-    ds.assert(t, language(), &lifecycle::started(&spec));
-    ds.assert(t, language(), &lifecycle::ready(&spec));
-    Ok(())
-}

syndicate-server/src/services/http_router.rs

@@ -1,348 +0,0 @@
-use preserves_schema::Codec;
-
-use std::convert::TryFrom;
-use std::io::Read;
-use std::sync::Arc;
-
-use syndicate::actor::*;
-use syndicate::enclose;
-use syndicate::error::Error;
-use syndicate::preserves::rec;
-use syndicate::preserves::value::Map;
-use syndicate::preserves::value::NestedValue;
-use syndicate::schemas::http;
-use syndicate::value::signed_integer::SignedInteger;
-
-use crate::language::language;
-use crate::lifecycle;
-use crate::schemas::internal_services::HttpRouter;
-use crate::schemas::internal_services::HttpStaticFileServer;
-
-use syndicate_macros::during;
-
-lazy_static::lazy_static! {
-    pub static ref MIME_TABLE: Map<String, String> = load_mime_table("/etc/mime.types").unwrap_or_default();
-}
-
-pub fn load_mime_table(path: &str) -> Result<Map<String, String>, std::io::Error> {
-    let mut table = Map::new();
-    let file = std::fs::read_to_string(path)?;
-    for line in file.split('\n') {
-        if line.starts_with('#') {
-            continue;
-        }
-        let pieces = line.split(&[' ', '\t'][..]).collect::<Vec<&str>>();
-        for i in 1..pieces.len() {
-            table.insert(pieces[i].to_string(), pieces[0].to_string());
-        }
-    }
-    Ok(table)
-}
-
-pub fn on_demand(t: &mut Activation, ds: Arc<Cap>) {
-    t.spawn(Some(AnyValue::symbol("http_router_listener")), move |t| {
-        enclose!((ds) during!(t, ds, language(), <run-service $spec: HttpRouter::<AnyValue>>, |t: &mut Activation| {
-            t.spawn_link(Some(rec![AnyValue::symbol("http_router"), language().unparse(&spec)]),
-                         enclose!((ds) |t| run(t, ds, spec)));
-            Ok(())
-        }));
-        enclose!((ds) during!(t, ds, language(), <run-service $spec: HttpStaticFileServer>, |t: &mut Activation| {
-            t.spawn_link(Some(rec![AnyValue::symbol("http_static_file_server"), language().unparse(&spec)]),
-                         enclose!((ds) |t| run_static_file_server(t, ds, spec)));
-            Ok(())
-        }));
-        Ok(())
-    });
-}
-
-#[derive(Debug, Clone)]
-struct ActiveHandler {
-    cap: Arc<Cap>,
-    terminated: Arc<Field<bool>>,
-}
-type MethodTable = Map<http::MethodPattern, Vec<ActiveHandler>>;
-type HostTable = Map<http::HostPattern, Map<http::PathPattern, MethodTable>>;
-type RoutingTable = Map<SignedInteger, HostTable>;
-
-fn request_host(value: &http::RequestHost) -> Option<String> {
-    match value {
-        http::RequestHost::Present(h) => Some(h.to_owned()),
-        http::RequestHost::Absent => None,
-    }
-}
-
-fn run(t: &mut Activation, ds: Arc<Cap>, spec: HttpRouter) -> ActorResult {
-    ds.assert(t, language(), &lifecycle::started(&spec));
-    ds.assert(t, language(), &lifecycle::ready(&spec));
-    let httpd = spec.httpd;
-
-    let routes: Arc<Field<RoutingTable>> = t.named_field("routes", Map::new());
-
-    enclose!((httpd, routes) during!(t, httpd, language(), <http-bind _ $port _ _ _>, |t: &mut Activation| {
-        let port1 = port.clone();
-        enclose!((httpd, routes) during!(t, httpd, language(), <http-listener #(&port1)>, enclose!((routes, port) |t: &mut Activation| {
-            let port2 = port.clone();
-            during!(t, httpd, language(), <http-bind $host #(&port2) $method $path $handler>, |t: &mut Activation| {
-                tracing::debug!("+HTTP binding {:?} {:?} {:?} {:?} {:?}", host, port, method, path, handler);
-                let port = port.value().to_signedinteger()?;
-                let host = language().parse::<http::HostPattern>(&host)?;
-                let path = language().parse::<http::PathPattern>(&path)?;
-                let method = language().parse::<http::MethodPattern>(&method)?;
-                let handler_cap = handler.value().to_embedded()?.clone();
-                let handler_terminated = t.named_field("handler-terminated", false);
-                t.get_mut(&routes)
-                    .entry(port.clone()).or_default()
-                    .entry(host.clone()).or_default()
-                    .entry(path.clone()).or_default()
-                    .entry(method.clone()).or_default()
-                    .push(ActiveHandler {
-                        cap: handler_cap.clone(),
-                        terminated: handler_terminated,
-                    });
-                t.on_stop(enclose!((routes, method, path, host, port) move |t| {
-                    tracing::debug!("-HTTP binding {:?} {:?} {:?} {:?} {:?}", host, port, method, path, handler);
-                    let port_map = t.get_mut(&routes);
-                    let host_map = port_map.entry(port.clone()).or_default();
-                    let path_map = host_map.entry(host.clone()).or_default();
-                    let method_map = path_map.entry(path.clone()).or_default();
-                    let handler_vec = method_map.entry(method.clone()).or_default();
-                    let handler = {
-                        let i = handler_vec.iter().position(|a| a.cap == handler_cap)
-                            .expect("Expected an index of an active handler to remove");
-                        handler_vec.swap_remove(i)
-                    };
-                    if handler_vec.is_empty() {
-                        method_map.remove(&method);
-                    }
-                    if method_map.is_empty() {
-                        path_map.remove(&path);
-                    }
-                    if path_map.is_empty() {
-                        host_map.remove(&host);
-                    }
-                    if host_map.is_empty() {
-                        port_map.remove(&port);
-                    }
-                    *t.get_mut(&handler.terminated) = true;
-                    Ok(())
-                }));
-                Ok(())
-            });
-            Ok(())
-        })));
-        Ok(())
-    }));
-
-    during!(t, httpd, language(), <request $req $res>, |t: &mut Activation| {
-        let req = match language().parse::<http::HttpRequest>(&req) { Ok(v) => v, Err(_) => return Ok(()) };
-        let res = match res.value().to_embedded() { Ok(v) => v, Err(_) => return Ok(()) };
-
-        tracing::trace!("Looking up handler for {:#?} in {:#?}", &req, &t.get(&routes));
-
-        let host_map = match t.get(&routes).get(&req.port) {
-            Some(host_map) => host_map,
-            None => return send_empty(t, res, 404, "Not found"),
-        };
-
-        let methods = match request_host(&req.host).and_then(|h| try_hostname(host_map, http::HostPattern::Host(h), &req.path).transpose()).transpose()? {
-            Some(methods) => methods,
-            None => match try_hostname(host_map, http::HostPattern::Any, &req.path)? {
-                Some(methods) => methods,
-                None => return send_empty(t, res, 404, "Not found"),
-            }
-        };
-
-        let handlers = match methods.get(&http::MethodPattern::Specific(req.method.clone())) {
-            Some(handlers) => handlers,
-            None => match methods.get(&http::MethodPattern::Any) {
-                Some(handlers) => handlers,
-                None => {
-                    let allowed = methods.keys().map(|k| match k {
-                        http::MethodPattern::Specific(m) => m.to_uppercase(),
-                        http::MethodPattern::Any => unreachable!(),
-                    }).collect::<Vec<String>>().join(", ");
-                    res.message(t, language(), &http::HttpResponse::Status {
-                        code: 405.into(), message: "Method Not Allowed".into() });
-                    res.message(t, language(), &http::HttpResponse::Header {
-                        name: "allow".into(), value: allowed });
-                    return send_done(t, res);
-                }
-            }
-        };
-
-        if handlers.len() > 1 {
-            tracing::warn!(?req, "Too many handlers available");
-        }
-        let ActiveHandler { cap, terminated } = handlers.first().expect("Nonempty handler set").clone();
-        tracing::trace!("Handler for {:?} is {:?}", &req, &cap);
-
-        t.dataflow(enclose!((terminated, req, res) move |t| {
-            if *t.get(&terminated) {
-                tracing::trace!("Handler for {:?} terminated", &req);
-                send_empty(t, &res, 500, "Internal Server Error")?;
-            }
-            Ok(())
-        }))?;
-
-        cap.assert(t, language(), &http::HttpContext { req, res: res.clone() });
-        Ok(())
-    });
-
-    Ok(())
-}
-
-fn send_done(t: &mut Activation, res: &Arc<Cap>) -> ActorResult {
-    res.message(t, language(), &http::HttpResponse::Done {
-        chunk: Box::new(http::Chunk::Bytes(vec![])) });
-    Ok(())
-}
-fn send_empty(t: &mut Activation, res: &Arc<Cap>, code: u16, message: &str) -> ActorResult {
-    res.message(t, language(), &http::HttpResponse::Status {
-        code: code.into(), message: message.into() });
-    send_done(t, res)
-}
-
-fn path_pattern_matches(path_pat: &http::PathPattern, path: &Vec<String>) -> bool {
-    let mut path_iter = path.iter();
-    for pat_elem in path_pat.0.iter() {
-        match pat_elem {
-            http::PathPatternElement::Label(v) => match path_iter.next() {
-                Some(path_elem) => {
-                    if v != path_elem {
-                        return false;
-                    }
-                }
-                None => return false,
-            },
-            http::PathPatternElement::Wildcard => match path_iter.next() {
-                Some(_) => (),
-                None => return false,
-            },
-            http::PathPatternElement::Rest => return true,
-        }
-    }
-    match path_iter.next() {
-        Some(_more) => false,
-        None => true,
-    }
-}
-
-fn try_hostname<'table>(
-    host_map: &'table HostTable,
-    host_pat: http::HostPattern,
-    path: &Vec<String>,
-) -> Result<Option<&'table MethodTable>, Error> {
-    match host_map.get(&host_pat) {
-        None => Ok(None),
-        Some(path_table) => {
-            for (path_pat, method_table) in path_table.iter() {
-                tracing::trace!("Checking path {:?} against pattern {:?}", &path, &path_pat);
-                if path_pattern_matches(path_pat, path) {
-                    return Ok(Some(method_table));
-                }
-            }
-            Ok(None)
-        }
-    }
-}
-
-fn render_dir(path: std::path::PathBuf) -> Result<(Vec<u8>, Option<&'static str>), Error> {
-    let mut body = String::new();
-    for entry in std::fs::read_dir(&path)? {
-        if let Ok(entry) = entry {
-            let is_dir = entry.metadata().map(|m| m.is_dir()).unwrap_or(false);
-            let name = entry.file_name().to_string_lossy()
-                .replace('&', "&amp;")
-                .replace('<', "&lt;")
-                .replace('>', "&gt;")
-                .replace('\'', "&apos;")
-                .replace('"', "&quot;") + (if is_dir { "/" } else { "" });
-            body.push_str(&format!("<a href=\"{}\">{}</a><br>\n", name, name));
-        }
-    }
-    Ok((body.into_bytes(), Some("text/html")))
-}
-
-impl HttpStaticFileServer {
-    fn respond(&mut self, t: &mut Activation, req: &http::HttpRequest, res: &Arc<Cap>) -> ActorResult {
-        let path_prefix_elements = usize::try_from(&self.path_prefix_elements)
-            .map_err(|_| "Bad pathPrefixElements")?;
-        let mut is_index = false;
-
-        let mut path = req.path[path_prefix_elements..].iter().cloned().collect::<Vec<String>>();
-        if let Some(e) = path.last_mut() {
-            if e.len() == 0 {
-                *e = "index.html".into();
-                is_index = true;
-            }
-        }
-
-        let mut realpath = std::path::PathBuf::from(&self.dir);
-        for element in path.into_iter() {
-            if element.contains('/') || element.starts_with('.') { Err("Invalid path element")?; }
-            realpath.push(element);
-        }
-
-        let (body, mime_type) = match std::fs::File::open(&realpath) {
-            Err(_) => {
-                if is_index {
-                    realpath.pop();
-                }
-                if std::fs::metadata(&realpath).is_ok_and(|m| m.is_dir()) {
-                    render_dir(realpath)?
-                } else {
-                    return send_empty(t, res, 404, "Not found")
-                }
-            },
-            Ok(mut fh) => {
-                if fh.metadata().is_ok_and(|m| m.is_dir()) {
-                    drop(fh);
-                    res.message(t, language(), &http::HttpResponse::Status {
-                        code: 301.into(), message: "Moved permanently".into() });
-                    res.message(t, language(), &http::HttpResponse::Header {
-                        name: "location".into(), value: format!("/{}/", req.path.join("/")) });
-                    return send_done(t, res);
-                } else {
-                    let mut buf = Vec::new();
-                    fh.read_to_end(&mut buf)?;
-                    if let Some(extension) = realpath.extension().and_then(|e| e.to_str()) {
-                        (buf, MIME_TABLE.get(extension).map(|m| m.as_str()))
-                    } else {
-                        (buf, None)
-                    }
-                }
-            }
-        };
-
-        res.message(t, language(), &http::HttpResponse::Status {
-            code: 200.into(), message: "OK".into() });
-        if let Some(mime_type) = mime_type {
-            res.message(t, language(), &http::HttpResponse::Header {
-                name: "content-type".into(), value: mime_type.to_owned() });
-        }
-        res.message(t, language(), &http::HttpResponse::Done {
-            chunk: Box::new(http::Chunk::Bytes(body)) });
-
-        Ok(())
-    }
-}
-
-impl Entity<http::HttpContext<AnyValue>> for HttpStaticFileServer {
-    fn assert(&mut self, t: &mut Activation, assertion: http::HttpContext<AnyValue>, _handle: Handle) -> ActorResult {
-        let http::HttpContext { req, res } = assertion;
-        if let Err(e) = self.respond(t, &req, &res) {
-            tracing::error!(?req, error=?e);
-            send_empty(t, &res, 500, "Internal server error")?;
-        }
-        Ok(())
-    }
-}
-
-fn run_static_file_server(t: &mut Activation, ds: Arc<Cap>, spec: HttpStaticFileServer) -> ActorResult {
-    let object = Cap::guard(&language().syndicate, t.create(spec.clone()));
-    ds.assert(t, language(), &syndicate::schemas::service::ServiceObject {
-        service_name: language().unparse(&spec),
-        object: AnyValue::domain(object),
-    });
-    Ok(())
-}

syndicate-server/src/services/mod.rs

@@ -1,7 +1,5 @@
 pub mod config_watcher;
 pub mod daemon;
 pub mod debt_reporter;
-pub mod gatekeeper;
-pub mod http_router;
 pub mod tcp_relay_listener;
 pub mod unix_relay_listener;

syndicate-server/src/services/tcp_relay_listener.rs

@@ -15,57 +15,28 @@ use tokio::net::TcpListener;
 use crate::language::language;
 use crate::lifecycle;
 use crate::protocol::detect_protocol;
-use crate::schemas::internal_services::TcpWithoutHttp;
+use crate::schemas::internal_services::TcpRelayListener;
 
 use syndicate_macros::during;
 
 pub fn on_demand(t: &mut Activation, ds: Arc<Cap>) {
     t.spawn(Some(AnyValue::symbol("tcp_relay_listener")), move |t| {
-        enclose!((ds) during!(t, ds, language(), <run-service $spec: TcpWithoutHttp::<AnyValue>>, |t| {
-            run_supervisor(t, ds.clone(), spec)
-        }));
-        Ok(())
+        Ok(during!(t, ds, language(), <run-service $spec: TcpRelayListener>, |t| {
+            Supervisor::start(
+                t,
+                Some(rec![AnyValue::symbol("relay"), language().unparse(&spec)]),
+                SupervisorConfiguration::default(),
+                enclose!((ds, spec) lifecycle::updater(ds, spec)),
+                enclose!((ds) move |t| enclose!((ds, spec) run(t, ds, spec))))
+        }))
     });
 }
 
-fn run_supervisor(t: &mut Activation, ds: Arc<Cap>, spec: TcpWithoutHttp) -> ActorResult {
-    Supervisor::start(
-        t,
-        Some(rec![AnyValue::symbol("relay"), language().unparse(&spec)]),
-        SupervisorConfiguration::default(),
-        enclose!((ds, spec) lifecycle::updater(ds, spec)),
-        enclose!((ds) move |t| enclose!((ds, spec) run(t, ds, spec))))
-}
-
-fn run(t: &mut Activation, ds: Arc<Cap>, spec: TcpWithoutHttp) -> ActorResult {
+fn run(t: &mut Activation, ds: Arc<Cap>, spec: TcpRelayListener) -> ActorResult {
     lifecycle::terminate_on_service_restart(t, &ds, &spec);
-
-    let httpd = t.named_field("httpd", None::<Arc<Cap>>);
-
-    {
-        let ad = spec.addr.clone();
-        let ad2 = ad.clone();
-        let gk = spec.gatekeeper.clone();
-        enclose!((ds, httpd) during!(t, ds, language(),
-            <run-service <relay-listener #(&language().unparse(&ad)) #(&AnyValue::domain(gk)) $h>>, |t: &mut Activation| {
-                if let Some(h) = h.value().as_embedded().cloned() {
-                    h.assert(t, language(), &syndicate::schemas::http::HttpListener { port: ad2.port.clone() });
-                    *t.get_mut(&httpd) = Some(h.clone());
-                    t.on_stop(enclose!((httpd) move |t| {
-                        let f = t.get_mut(&httpd);
-                        if *f == Some(h.clone()) { *f = None; }
-                        Ok(())
-                    }));
-                }
-                Ok(())
-            }));
-    }
-
-    let TcpWithoutHttp { addr, gatekeeper } = spec.clone();
-
-    let host = addr.host.clone();
-    let port = u16::try_from(&addr.port).map_err(|_| "Invalid TCP port number")?;
-    let facet = t.facet_ref();
+    let host = spec.addr.host.clone();
+    let port = u16::try_from(&spec.addr.port).map_err(|_| "Invalid TCP port number")?;
+    let facet = t.facet.clone();
     let trace_collector = t.trace_collector();
     t.linked_task(Some(AnyValue::symbol("listener")), async move {
         let listen_addr = format!("{}:{}", host, port);
@@ -87,24 +58,17 @@ fn run(t: &mut Activation, ds: Arc<Cap>, spec: TcpWithoutHttp) -> ActorResult {
 
         loop {
             let (stream, addr) = listener.accept().await?;
-            let gatekeeper = gatekeeper.clone();
+            let gatekeeper = spec.gatekeeper.clone();
             let name = Some(rec![AnyValue::symbol("tcp"), AnyValue::new(format!("{}", &addr))]);
             let cause = trace_collector.as_ref().map(|_| trace::TurnCause::external("connect"));
             let account = Account::new(name.clone(), trace_collector.clone());
             if !facet.activate(
-                &account, cause, enclose!((trace_collector, httpd) move |t| {
-                    let httpd = t.get(&httpd).clone();
+                &account, cause, enclose!((trace_collector) move |t| {
                     t.spawn(name, move |t| {
                         Ok(t.linked_task(None, {
-                            let facet = t.facet_ref();
+                            let facet = t.facet.clone();
                             async move {
-                                detect_protocol(trace_collector,
-                                                facet,
-                                                stream,
-                                                gatekeeper,
-                                                httpd,
-                                                addr,
-                                                port).await?;
+                                detect_protocol(trace_collector, facet, stream, gatekeeper, addr).await?;
                                 Ok(LinkedTaskTermination::KeepFacet)
                             }
                         }))

syndicate-server/src/services/unix_relay_listener.rs

@@ -25,7 +25,7 @@ use syndicate_macros::during;
 
 pub fn on_demand(t: &mut Activation, ds: Arc<Cap>) {
     t.spawn(Some(AnyValue::symbol("unix_relay_listener")), move |t| {
-        Ok(during!(t, ds, language(), <run-service $spec: UnixRelayListener::<AnyValue>>, |t| {
+        Ok(during!(t, ds, language(), <run-service $spec: UnixRelayListener>, |t| {
             Supervisor::start(
                 t,
                 Some(rec![AnyValue::symbol("relay"), language().unparse(&spec)]),
@@ -39,7 +39,7 @@ pub fn on_demand(t: &mut Activation, ds: Arc<Cap>) {
 fn run(t: &mut Activation, ds: Arc<Cap>, spec: UnixRelayListener) -> ActorResult {
     lifecycle::terminate_on_service_restart(t, &ds, &spec);
     let path_str = spec.addr.path.clone();
-    let facet = t.facet_ref();
+    let facet = t.facet.clone();
     let trace_collector = t.trace_collector();
     t.linked_task(Some(AnyValue::symbol("listener")), async move {
         let listener = bind_unix_listener(&PathBuf::from(path_str)).await?;
@@ -71,7 +71,7 @@ fn run(t: &mut Activation, ds: Arc<Cap>, spec: UnixRelayListener) -> ActorResult
                 &account, cause, enclose!((trace_collector) move |t| {
                     t.spawn(name, |t| {
                         Ok(t.linked_task(None, {
-                            let facet = t.facet_ref();
+                            let facet = t.facet.clone();
                             async move {
                                 tracing::info!(protocol = %"unix");
                                 let (i, o) = stream.into_split();

syndicate-tools/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "syndicate-tools"
-version = "0.18.0"
+version = "0.9.0"
 authors = ["Tony Garnock-Jones <tonyg@leastfixedpoint.com>"]
 edition = "2018"
 
@@ -10,8 +10,8 @@ repository = "https://git.syndicate-lang.org/syndicate-lang/syndicate-rs"
 license = "Apache-2.0"
 
 [dependencies]
-preserves = "4.995"
-syndicate = { path = "../syndicate", version = "0.40.0"}
+preserves = "4.991"
+syndicate = { path = "../syndicate", version = "0.30.0"}
 
 clap = { version = "^4.0", features = ["derive"] }
 clap_complete = "^4.0"

syndicate-tools/src/bin/syndicate-macaroon.rs

@@ -23,8 +23,6 @@ use syndicate::language;
 use syndicate::preserves_schema::Codec;
 use syndicate::preserves_schema::ParseError;
 use syndicate::schemas::noise;
-use syndicate::sturdy::Caveat;
-use syndicate::sturdy::SturdyRef;
 use syndicate::sturdy::_Any;
 
 #[derive(Clone, Debug)]
@@ -46,10 +44,6 @@ enum Action {
         #[arg(long, group="key")]
         /// Key bytes, encoded as hex
         hex: Option<String>,
-
-        #[arg(long)]
-        /// Caveats to add
-        caveat: Vec<Preserves<_Any>>,
     },
 
     #[command(group(ArgGroup::new("key").required(true)))]
@@ -142,7 +136,7 @@ fn main() -> io::Result<()> {
                                               &language().unparse(&n))?);
         }
 
-        Action::Mint { oid, phrase, hex, caveat: caveats } => {
+        Action::Mint { oid, phrase, hex } => {
             let key =
                 if let Some(hex) = hex {
                     HexParser::Liberal.decode(&hex).expect("hex encoded sturdyref")
@@ -151,14 +145,7 @@ fn main() -> io::Result<()> {
                 } else {
                     unreachable!()
                 };
-            let attenuation = caveats.into_iter().map(|c| {
-                let r = language().parse(&c.0);
-                if let Ok(Caveat::Unknown(_)) = &r {
-                    eprintln!("Warning: Unknown caveat format: {:?}", &c.0);
-                }
-                r
-            }).collect::<Result<Vec<Caveat>, _>>()?;
-            let m = SturdyRef::mint(oid.0, &key).attenuate(&attenuation)?;
+            let m = syndicate::sturdy::SturdyRef::mint(oid.0, &key);
             println!("{}", TextWriter::encode(&mut NoEmbeddedDomainCodec,
                                               &language().unparse(&m))?);
         }

syndicate/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "syndicate"
-version = "0.40.0"
+version = "0.30.0"
 authors = ["Tony Garnock-Jones <tonyg@leastfixedpoint.com>"]
 edition = "2018"
 
@@ -13,23 +13,24 @@ license = "Apache-2.0"
 vendored-openssl = ["openssl/vendored"]
 
 [build-dependencies]
-preserves-schema = "5.995"
+preserves-schema = "4.991"
 
 [dependencies]
-preserves = "4.995"
-preserves-schema = "5.995"
+preserves = "4.991"
+preserves-schema = "4.991"
 
-tokio = { version = "1.10", features = ["io-std", "io-util", "macros", "rt", "rt-multi-thread", "time"] }
-tokio-util = "0.6"
-bytes = "1.0"
+tokio = { version = "1.33", features = ["io-util", "macros", "rt", "rt-multi-thread", "time"] }
+tokio-util = "0.7"
+bytes = "1.5"
 
 futures = "0.3"
 
 blake2 = "0.10"
+crossbeam = "0.8"
 getrandom = "0.2"
 hmac = "0.12"
 lazy_static = "1.4"
-parking_lot = "0.11"
+parking_lot = "0.12"
 
 tracing = "0.1"
 tracing-subscriber = "0.2"

syndicate/benches/bench_dataspace.rs

@@ -11,7 +11,6 @@ use syndicate::during::entity;
 use syndicate::dataspace::Dataspace;
 use syndicate::schemas::dataspace::Observe;
 use syndicate::schemas::dataspace_patterns as p;
-use syndicate::value::Map;
 use syndicate::value::NestedValue;
 use syndicate::value::Value;
 
@@ -89,11 +88,11 @@ pub fn bench_pub(c: &mut Criterion) {
                             .create_cap(t);
 
                         ds.assert(t, language(), &Observe {
-                            pattern: p::Pattern::Bind {
-                                pattern: Box::new(p::Pattern::Lit {
-                                    value: Box::new(p::AnyAtom::Symbol("consumer".to_owned())),
-                                }),
-                            },
+                            pattern: p::Pattern::DBind(Box::new(p::DBind {
+                                pattern: p::Pattern::DLit(Box::new(p::DLit {
+                                    value: p::AnyAtom::Symbol("consumer".to_owned()),
+                                })),
+                            })),
                             observer: shutdown,
                         });
 
@@ -111,27 +110,24 @@ pub fn bench_pub(c: &mut Criterion) {
 
                             ds.assert(t, &(), &AnyValue::symbol("consumer"));
                             ds.assert(t, language(), &Observe {
-                                pattern: p::Pattern::Group {
-                                    type_: Box::new(p::GroupType::Rec {
-                                        label: AnyValue::symbol("Says"),
-                                    }),
-                                    entries: Map::from([
-                                        (p::_Any::new(0), p::Pattern::Lit {
-                                            value: Box::new(p::AnyAtom::String("bench_pub".to_owned())),
-                                        }),
-                                        (p::_Any::new(1), p::Pattern::Bind {
-                                            pattern: Box::new(p::Pattern::Discard),
-                                        }),
-                                    ]),
-                                },
+                                pattern: p::Pattern::DCompound(Box::new(p::DCompound::Rec {
+                                    label: AnyValue::symbol("Says"),
+                                    fields: vec![
+                                        p::Pattern::DLit(Box::new(p::DLit {
+                                            value: p::AnyAtom::String("bench_pub".to_owned()),
+                                        })),
+                                        p::Pattern::DBind(Box::new(p::DBind {
+                                            pattern: p::Pattern::DDiscard(Box::new(p::DDiscard)),
+                                        })),
+                                    ]})),
                                 observer: receiver,
                             });
                             ds.assert(t, language(), &Observe {
-                                pattern: p::Pattern::Bind {
-                                    pattern: Box::new(p::Pattern::Lit {
-                                        value: Box::new(p::AnyAtom::Bool(true)),
-                                    }),
-                                },
+                                pattern: p::Pattern::DBind(Box::new(p::DBind {
+                                    pattern: p::Pattern::DLit(Box::new(p::DLit {
+                                        value: p::AnyAtom::Bool(true),
+                                    })),
+                                })),
                                 observer: shutdown,
                             });
 

syndicate/build.rs

@@ -26,11 +26,11 @@ fn main() -> std::io::Result<()> {
     let mut gen_dir = buildroot.clone();
     gen_dir.push("src/schemas");
 
-    let mut c = CompilerConfig::new("crate::schemas".to_owned());
+    let mut c = CompilerConfig::new(gen_dir, "crate::schemas".to_owned());
     c.plugins.push(Box::new(syndicate_plugins::PatternPlugin));
     c.add_external_module(ExternalModule::new(vec!["EntityRef".to_owned()], "crate::actor"));
 
     let inputs = expand_inputs(&vec!["protocols/schema-bundle.bin".to_owned()])?;
     c.load_schemas_and_bundles(&inputs, &vec![])?;
-    compile(&c, &mut CodeCollector::files(gen_dir))
+    compile(&c)
 }

syndicate/protocols/schema-bundle.bin

@@ -2,15 +2,15 @@
 tcp-remote„´³tupleµ´³named³host´³atom³String„„´³named³port´³atom³
SignedInteger„„„„„³TcpPeerInfo´³rec´³lit³tcp-peer„´³tupleµ´³named³handle´³embedded³any„„´³named³local´³refµ„³TcpLocal„„´³named³remote´³refµ„³	TcpRemote„„„„„„³embeddedType´³refµ³	EntityRef„³Cap„„„µ³http„´³schema·³version°

³definitions·³Chunk´³orµµ±string´³atom³String„„µ±bytes´³atom³
 ByteString„„„„³Headers´³dictof´³atom³Symbol„´³atom³String„„³MimeType´³atom³Symbol„³
 QueryValue´³orµµ±string´³atom³String„„µ±file´³rec´³lit³file„´³tupleµ´³named³filename´³atom³String„„´³named³headers´³refµ„³Headers„„´³named³body´³atom³
-ByteString„„„„„„„„³HostPattern´³orµµ±host´³atom³String„„µ±any´³lit€„„„„³HttpBinding´³rec´³lit³	http-bind„´³tupleµ´³named³host´³refµ„³HostPattern„„´³named³port´³atom³
SignedInteger„„´³named³method´³refµ„³
MethodPattern„„´³named³path´³refµ„³PathPattern„„´³named³handler´³embedded´³refµ„³HttpRequest„„„„„„³HttpContext´³rec´³lit³request„´³tupleµ´³named³req´³refµ„³HttpRequest„„´³named³res´³embedded´³refµ„³HttpResponse„„„„„„³HttpRequest´³rec´³lit³http-request„´³tupleµ´³named³sequenceNumber´³atom³
SignedInteger„„´³named³host´³refµ„³RequestHost„„´³named³port´³atom³
SignedInteger„„´³named³method´³atom³Symbol„„´³named³path´³seqof´³atom³String„„„´³named³headers´³refµ„³Headers„„´³named³query´³dictof´³atom³Symbol„´³seqof´³refµ„³
+ByteString„„„„„„„„³HostPattern´³orµµ±host´³atom³String„„µ±any´³lit€„„„„³HttpBinding´³rec´³lit³	http-bind„´³tupleµ´³named³host´³refµ„³HostPattern„„´³named³port´³atom³
SignedInteger„„´³named³method´³refµ„³
MethodPattern„„´³named³path´³refµ„³PathPattern„„´³named³handler´³embedded´³refµ„³HttpRequest„„„„„„³HttpContext´³rec´³lit³request„´³tupleµ´³named³req´³refµ„³HttpRequest„„´³named³res´³embedded´³refµ„³HttpResponse„„„„„„³HttpRequest´³rec´³lit³http-request„´³tupleµ´³named³sequenceNumber´³atom³
SignedInteger„„´³named³host´³atom³String„„´³named³port´³atom³
SignedInteger„„´³named³method´³atom³Symbol„„´³named³path´³seqof´³atom³String„„„´³named³headers´³refµ„³Headers„„´³named³query´³dictof´³atom³Symbol„´³seqof´³refµ„³
 QueryValue„„„„´³named³body´³refµ„³RequestBody„„„„„³HttpService´³rec´³lit³http-service„´³tupleµ´³named³host´³refµ„³HostPattern„„´³named³port´³atom³
SignedInteger„„´³named³method´³refµ„³
MethodPattern„„´³named³path´³refµ„³PathPattern„„„„„³PathPattern´³seqof´³refµ„³PathPatternElement„„³RequestBody´³orµµ±present´³atom³
-ByteString„„µ±absent´³lit€„„„„³RequestHost´³orµµ±present´³atom³String„„µ±absent´³lit€„„„„³HttpListener´³rec´³lit³
http-listener„´³tupleµ´³named³port´³atom³
SignedInteger„„„„„³HttpResponse´³orµµ±status´³rec´³lit³status„´³tupleµ´³named³code´³atom³
SignedInteger„„´³named³message´³atom³String„„„„„„µ±header´³rec´³lit³header„´³tupleµ´³named³name´³atom³Symbol„„´³named³value´³atom³String„„„„„„µ±chunk´³rec´³lit³chunk„´³tupleµ´³named³chunk´³refµ„³Chunk„„„„„„µ±done´³rec´³lit³done„´³tupleµ´³named³chunk´³refµ„³Chunk„„„„„„„„³
MethodPattern´³orµµ±any´³lit€„„µ±specific´³atom³Symbol„„„„³PathPatternElement´³orµµ±label´³atom³String„„µ±wildcard´³lit³
_„„µ±rest´³lit³...„„„„„³embeddedType€„„µ³noise„´³schema·³version°

³definitions·³Packet´³orµµ±complete´³atom³
+ByteString„„µ±absent´³lit€„„„„³HttpListener´³rec´³lit³
http-listener„´³tupleµ´³named³port´³atom³
SignedInteger„„„„„³HttpResponse´³orµµ±status´³rec´³lit³status„´³tupleµ´³named³code´³atom³
SignedInteger„„´³named³message´³atom³String„„„„„„µ±header´³rec´³lit³header„´³tupleµ´³named³name´³atom³Symbol„„´³named³value´³atom³String„„„„„„µ±chunk´³rec´³lit³chunk„´³tupleµ´³named³chunk´³refµ„³Chunk„„„„„„µ±done´³rec´³lit³done„´³tupleµ´³named³chunk´³refµ„³Chunk„„„„„„„„³
MethodPattern´³orµµ±any´³lit€„„µ±specific´³atom³Symbol„„„„³PathPatternElement´³orµµ±label´³atom³String„„µ±wildcard´³lit³
_„„µ±rest´³lit³...„„„„„³embeddedType€„„µ³noise„´³schema·³version°

³definitions·³Packet´³orµµ±complete´³atom³
 ByteString„„µ±
 fragmented´³seqof´³atom³
-ByteString„„„„„³	Initiator´³rec´³lit³	initiator„´³tupleµ´³named³initiatorSession´³embedded´³refµ„³Packet„„„„„„³	NoiseSpec´³andµ´³dict·³key´³named³key´³atom³
-ByteString„„³service´³named³service´³refµ„³ServiceSelector„„„„´³named³protocol´³refµ„³
NoiseProtocol„„´³named³
preSharedKeys´³refµ„³NoisePreSharedKeys„„„„³SessionItem´³orµµ±	Initiator´³refµ„³	Initiator„„µ±Packet´³refµ„³Packet„„„„³
NoiseProtocol´³orµµ±present´³dict·³protocol´³named³protocol´³atom³String„„„„„µ±invalid´³dict·³protocol´³named³protocol³any„„„„µ±absent´³dict·„„„„„³
NoiseStepType´³lit³noise„³SecretKeyField´³orµµ±present´³dict·³	secretKey´³named³	secretKey´³atom³
+ByteString„„„„„³	NoiseSpec´³andµ´³dict·³key´³named³key´³atom³
+ByteString„„³service´³named³service´³refµ„³ServiceSelector„„„„´³named³protocol´³refµ„³
NoiseProtocol„„´³named³
preSharedKeys´³refµ„³NoisePreSharedKeys„„„„³
NoiseProtocol´³orµµ±present´³dict·³protocol´³named³protocol´³atom³String„„„„„µ±invalid´³dict·³protocol´³named³protocol³any„„„„µ±absent´³dict·„„„„„³
NoiseStepType´³lit³noise„³SecretKeyField´³orµµ±present´³dict·³	secretKey´³named³	secretKey´³atom³
 ByteString„„„„„µ±invalid´³dict·³	secretKey´³named³	secretKey³any„„„„µ±absent´³dict·„„„„„³DefaultProtocol´³lit±!Noise_NK_25519_ChaChaPoly_BLAKE2s„³NoiseStepDetail´³refµ„³ServiceSelector„³ServiceSelector³any³NoiseServiceSpec´³andµ´³named³base´³refµ„³	NoiseSpec„„´³named³	secretKey´³refµ„³SecretKeyField„„„„³NoisePreSharedKeys´³orµµ±present´³dict·³
preSharedKeys´³named³
preSharedKeys´³seqof´³atom³
-ByteString„„„„„„µ±invalid´³dict·³
preSharedKeys´³named³
preSharedKeys³any„„„„µ±absent´³dict·„„„„„³NoisePathStepDetail´³refµ„³	NoiseSpec„³NoiseDescriptionDetail´³refµ„³NoiseServiceSpec„„³embeddedType´³refµ³	EntityRef„³Cap„„„µ³timer„´³schema·³version°

³definitions·³SetTimer´³rec´³lit³	set-timer„´³tupleµ´³named³label³any„´³named³seconds´³atom³Double„„´³named³kind´³refµ„³	TimerKind„„„„„³	LaterThan´³rec´³lit³
+ByteString„„„„„„µ±invalid´³dict·³
preSharedKeys´³named³
preSharedKeys³any„„„„µ±absent´³dict·„„„„„³NoisePathStepDetail´³refµ„³	NoiseSpec„³NoiseDescriptionDetail´³refµ„³NoiseServiceSpec„„³embeddedType€„„µ³timer„´³schema·³version°

³definitions·³SetTimer´³rec´³lit³	set-timer„´³tupleµ´³named³label³any„´³named³seconds´³atom³Double„„´³named³kind´³refµ„³	TimerKind„„„„„³	LaterThan´³rec´³lit³
 later-than„´³tupleµ´³named³seconds´³atom³Double„„„„„³	TimerKind´³orµµ±relative´³lit³relative„„µ±absolute´³lit³absolute„„µ±clear´³lit³clear„„„„³TimerExpired´³rec´³lit³
timer-expired„´³tupleµ´³named³label³any„´³named³seconds´³atom³Double„„„„„„³embeddedType€„„µ³trace„´³schema·³version°

³definitions·³Oid³any³Name´³orµµ±	anonymous´³rec´³lit³	anonymous„´³tupleµ„„„„µ±named´³rec´³lit³named„´³tupleµ´³named³name³any„„„„„„„³Target´³rec´³lit³entity„´³tupleµ´³named³actor´³refµ„³ActorId„„´³named³facet´³refµ„³FacetId„„´³named³oid´³refµ„³Oid„„„„„³TaskId³any³TurnId³any³ActorId³any³FacetId³any³	TurnCause´³orµµ±turn´³rec´³lit³	caused-by„´³tupleµ´³named³id´³refµ„³TurnId„„„„„„µ±cleanup´³rec´³lit³cleanup„´³tupleµ„„„„µ±linkedTaskRelease´³rec´³lit³linked-task-release„´³tupleµ´³named³id´³refµ„³TaskId„„´³named³reason´³refµ„³LinkedTaskReleaseReason„„„„„„µ±periodicActivation´³rec´³lit³periodic-activation„´³tupleµ´³named³period´³atom³Double„„„„„„µ±delay´³rec´³lit³delay„´³tupleµ´³named³causingTurn´³refµ„³TurnId„„´³named³amount´³atom³Double„„„„„„µ±external´³rec´³lit³external„´³tupleµ´³named³description³any„„„„„„„³	TurnEvent´³orµµ±assert´³rec´³lit³assert„´³tupleµ´³named³	assertion´³refµ„³AssertionDescription„„´³named³handle´³refµ³protocol„³Handle„„„„„„µ±retract´³rec´³lit³retract„´³tupleµ´³named³handle´³refµ³protocol„³Handle„„„„„„µ±message´³rec´³lit³message„´³tupleµ´³named³body´³refµ„³AssertionDescription„„„„„„µ±sync´³rec´³lit³sync„´³tupleµ´³named³peer´³refµ„³Target„„„„„„µ±	breakLink´³rec´³lit³
 break-link„´³tupleµ´³named³source´³refµ„³ActorId„„´³named³handle´³refµ³protocol„³Handle„„„„„„„„³
 ExitStatus´³orµµ±ok´³lit³ok„„µ±Error´³refµ³protocol„³Error„„„„³
@@ -18,13 +18,9 @@ TraceEntry
 ExitStatus„„„„„„„„³FacetStopReason´³orµµ±explicitAction´³lit³explicit-action„„µ±inert´³lit³inert„„µ±parentStopping´³lit³parent-stopping„„µ±
actorStopping´³lit³actor-stopping„„„„³TurnDescription´³rec´³lit³turn„´³tupleµ´³named³id´³refµ„³TurnId„„´³named³cause´³refµ„³	TurnCause„„´³named³actions´³seqof´³refµ„³ActionDescription„„„„„„³ActionDescription´³orµµ±dequeue´³rec´³lit³dequeue„´³tupleµ´³named³event´³refµ„³TargetedTurnEvent„„„„„„µ±enqueue´³rec´³lit³enqueue„´³tupleµ´³named³event´³refµ„³TargetedTurnEvent„„„„„„µ±dequeueInternal´³rec´³lit³dequeue-internal„´³tupleµ´³named³event´³refµ„³TargetedTurnEvent„„„„„„µ±enqueueInternal´³rec´³lit³enqueue-internal„´³tupleµ´³named³event´³refµ„³TargetedTurnEvent„„„„„„µ±spawn´³rec´³lit³spawn„´³tupleµ´³named³link´³atom³Boolean„„´³named³id´³refµ„³ActorId„„„„„„µ±link´³rec´³lit³link„´³tupleµ´³named³parentActor´³refµ„³ActorId„„´³named³
childToParent´³refµ³protocol„³Handle„„´³named³
 childActor´³refµ„³ActorId„„´³named³
parentToChild´³refµ³protocol„³Handle„„„„„„µ±
 facetStart´³rec´³lit³facet-start„´³tupleµ´³named³path´³seqof´³refµ„³FacetId„„„„„„„µ±	facetStop´³rec´³lit³
-facet-stop„´³tupleµ´³named³path´³seqof´³refµ„³FacetId„„„´³named³reason´³refµ„³FacetStopReason„„„„„„µ±linkedTaskStart´³rec´³lit³linked-task-start„´³tupleµ´³named³taskName´³refµ„³Name„„´³named³id´³refµ„³TaskId„„„„„„„„³TargetedTurnEvent´³rec´³lit³event„´³tupleµ´³named³target´³refµ„³Target„„´³named³detail´³refµ„³	TurnEvent„„„„„³AssertionDescription´³orµµ±value´³rec´³lit³value„´³tupleµ´³named³value³any„„„„„µ±opaque´³rec´³lit³opaque„´³tupleµ´³named³description³any„„„„„„„³LinkedTaskReleaseReason´³orµµ±	cancelled´³lit³	cancelled„„µ±normal´³lit³normal„„„„„³embeddedType´³refµ³	EntityRef„³Cap„„„µ³stdenv„´³schema·³version°

³definitions·³
StandardRoute´³orµµ±standard´³tuplePrefixµ´³named³
-transports´³seqof´³refµ„³StandardTransport„„„´³named³key´³atom³
-ByteString„„´³named³service³any„´³named³sig´³atom³
-ByteString„„´³named³oid³any„„´³named³caveats´³seqof´³refµ³sturdy„³Caveat„„„„„µ±general´³refµ³
-gatekeeper„³Route„„„„³StandardTransport´³orµµ±wsUrl´³atom³String„„µ±other³any„„„„³embeddedType€„„µ³stream„´³schema·³version°

³definitions·³Mode´³orµµ±bytes´³lit³bytes„„µ±lines´³refµ„³LineMode„„µ±packet´³rec´³lit³packet„´³tupleµ´³named³size´³atom³
SignedInteger„„„„„„µ±object´³rec´³lit³object„´³tupleµ´³named³description³any„„„„„„„³Sink´³orµµ±source´³rec´³lit³source„´³tupleµ´³named³
+facet-stop„´³tupleµ´³named³path´³seqof´³refµ„³FacetId„„„´³named³reason´³refµ„³FacetStopReason„„„„„„µ±linkedTaskStart´³rec´³lit³linked-task-start„´³tupleµ´³named³taskName´³refµ„³Name„„´³named³id´³refµ„³TaskId„„„„„„„„³TargetedTurnEvent´³rec´³lit³event„´³tupleµ´³named³target´³refµ„³Target„„´³named³detail´³refµ„³	TurnEvent„„„„„³AssertionDescription´³orµµ±value´³rec´³lit³value„´³tupleµ´³named³value³any„„„„„µ±opaque´³rec´³lit³opaque„´³tupleµ´³named³description³any„„„„„„„³LinkedTaskReleaseReason´³orµµ±	cancelled´³lit³	cancelled„„µ±normal´³lit³normal„„„„„³embeddedType´³refµ³	EntityRef„³Cap„„„µ³stream„´³schema·³version°

³definitions·³Mode´³orµµ±bytes´³lit³bytes„„µ±lines´³refµ„³LineMode„„µ±packet´³rec´³lit³packet„´³tupleµ´³named³size´³atom³
SignedInteger„„„„„„µ±object´³rec´³lit³object„´³tupleµ´³named³description³any„„„„„„„³Sink´³orµµ±source´³rec´³lit³source„´³tupleµ´³named³
 controller´³embedded´³refµ„³Source„„„„„„„µ±StreamError´³refµ„³StreamError„„µ±data´³rec´³lit³data„´³tupleµ´³named³payload³any„´³named³mode´³refµ„³Mode„„„„„„µ±eof´³rec´³lit³eof„´³tupleµ„„„„„„³Source´³orµµ±sink´³rec´³lit³sink„´³tupleµ´³named³
-controller´³embedded´³refµ„³Sink„„„„„„„µ±StreamError´³refµ„³StreamError„„µ±credit´³rec´³lit³credit„´³tupleµ´³named³amount´³refµ„³CreditAmount„„´³named³mode´³refµ„³Mode„„„„„„„„³LineMode´³orµµ±lf´³lit³lf„„µ±crlf´³lit³crlf„„„„³StreamError´³rec´³lit³error„´³tupleµ´³named³message´³atom³String„„„„„³CreditAmount´³orµµ±count´³atom³
SignedInteger„„µ±	unbounded´³lit³	unbounded„„„„³StreamConnection´³rec´³lit³stream-connection„´³tupleµ´³named³source´³embedded´³refµ„³Source„„„´³named³sink´³embedded´³refµ„³Sink„„„´³named³spec³any„„„„³StreamListenerError´³rec´³lit³stream-listener-error„´³tupleµ´³named³spec³any„´³named³message´³atom³String„„„„„³StreamListenerReady´³rec´³lit³stream-listener-ready„´³tupleµ´³named³spec³any„„„„„³embeddedType´³refµ³	EntityRef„³Cap„„„µ³sturdy„´³schema·³version°

³definitions·³Lit´³rec´³lit³lit„´³tupleµ´³named³value³any„„„„³Oid´³atom³
SignedInteger„³Alts´³rec´³lit³or„´³tupleµ´³named³alternatives´³seqof´³refµ„³Rewrite„„„„„„³PAnd´³rec´³lit³and„´³tupleµ´³named³patterns´³seqof´³refµ„³Pattern„„„„„„³PNot´³rec´³lit³not„´³tupleµ´³named³pattern´³refµ„³Pattern„„„„„³TRef´³rec´³lit³ref„´³tupleµ´³named³binding´³atom³
SignedInteger„„„„„³PAtom´³orµµ±Boolean´³lit³Boolean„„µ±Double´³lit³Double„„µ±
SignedInteger´³lit³
SignedInteger„„µ±String´³lit³String„„µ±
+controller´³embedded´³refµ„³Sink„„„„„„„µ±StreamError´³refµ„³StreamError„„µ±credit´³rec´³lit³credit„´³tupleµ´³named³amount´³refµ„³CreditAmount„„´³named³mode´³refµ„³Mode„„„„„„„„³LineMode´³orµµ±lf´³lit³lf„„µ±crlf´³lit³crlf„„„„³StreamError´³rec´³lit³error„´³tupleµ´³named³message´³atom³String„„„„„³CreditAmount´³orµµ±count´³atom³
SignedInteger„„µ±	unbounded´³lit³	unbounded„„„„³StreamConnection´³rec´³lit³stream-connection„´³tupleµ´³named³source´³embedded´³refµ„³Source„„„´³named³sink´³embedded´³refµ„³Sink„„„´³named³spec³any„„„„³StreamListenerError´³rec´³lit³stream-listener-error„´³tupleµ´³named³spec³any„´³named³message´³atom³String„„„„„³StreamListenerReady´³rec´³lit³stream-listener-ready„´³tupleµ´³named³spec³any„„„„„³embeddedType´³refµ³	EntityRef„³Cap„„„µ³sturdy„´³schema·³version°

³definitions·³Lit´³rec´³lit³lit„´³tupleµ´³named³value³any„„„„³Oid´³atom³
SignedInteger„³Alts´³rec´³lit³or„´³tupleµ´³named³alternatives´³seqof´³refµ„³Rewrite„„„„„„³PAnd´³rec´³lit³and„´³tupleµ´³named³patterns´³seqof´³refµ„³Pattern„„„„„„³PNot´³rec´³lit³not„´³tupleµ´³named³pattern´³refµ„³Pattern„„„„„³TRef´³rec´³lit³ref„´³tupleµ´³named³binding´³atom³
SignedInteger„„„„„³PAtom´³orµµ±Boolean´³lit³Boolean„„µ±Float´³lit³Float„„µ±Double´³lit³Double„„µ±
SignedInteger´³lit³
SignedInteger„„µ±String´³lit³String„„µ±
 ByteString´³lit³
 ByteString„„µ±Symbol´³lit³Symbol„„„„³PBind´³rec´³lit³bind„´³tupleµ´³named³pattern´³refµ„³Pattern„„„„„³Caveat´³orµµ±Rewrite´³refµ„³Rewrite„„µ±Alts´³refµ„³Alts„„µ±Reject´³refµ„³Reject„„µ±unknown³any„„„³Reject´³rec´³lit³reject„´³tupleµ´³named³pattern´³refµ„³Pattern„„„„„³Pattern´³orµµ±PDiscard´³refµ„³PDiscard„„µ±PAtom´³refµ„³PAtom„„µ±	PEmbedded´³refµ„³	PEmbedded„„µ±PBind´³refµ„³PBind„„µ±PAnd´³refµ„³PAnd„„µ±PNot´³refµ„³PNot„„µ±Lit´³refµ„³Lit„„µ±	PCompound´³refµ„³	PCompound„„„„³Rewrite´³rec´³lit³rewrite„´³tupleµ´³named³pattern´³refµ„³Pattern„„´³named³template´³refµ„³Template„„„„„³WireRef´³orµµ±mine´³tupleµ´³lit°„´³named³oid´³refµ„³Oid„„„„„µ±yours´³tuplePrefixµ´³lit°

„´³named³oid´³refµ„³Oid„„„´³named³attenuation´³seqof´³refµ„³Caveat„„„„„„„³PDiscard´³rec´³lit³
_„´³tupleµ„„„³Template´³orµµ±
 TAttenuate´³refµ„³
@@ -38,7 +34,7 @@ Parameters
 Parameters„³SturdyDescriptionDetail´³dict·³key´³named³key´³atom³
 ByteString„„³oid´³named³oid³any„„„„³embeddedType´³refµ³	EntityRef„³Cap„„„µ³worker„´³schema·³version°

³definitions·³Instance´³rec´³lit³Instance„´³tupleµ´³named³name´³atom³String„„´³named³argument³any„„„„„³embeddedType´³refµ³	EntityRef„³Cap„„„µ³service„´³schema·³version°

³definitions·³State´³orµµ±started´³lit³started„„µ±ready´³lit³ready„„µ±failed´³lit³failed„„µ±complete´³lit³complete„„µ±userDefined³any„„„³
 RunService´³rec´³lit³run-service„´³tupleµ´³named³serviceName³any„„„„³ServiceState´³rec´³lit³
service-state„´³tupleµ´³named³serviceName³any„´³named³state´³refµ„³State„„„„„³
ServiceObject´³rec´³lit³service-object„´³tupleµ´³named³serviceName³any„´³named³object³any„„„„³RequireService´³rec´³lit³require-service„´³tupleµ´³named³serviceName³any„„„„³RestartService´³rec´³lit³restart-service„´³tupleµ´³named³serviceName³any„„„„³ServiceDependency´³rec´³lit³
-depends-on„´³tupleµ´³named³depender³any„´³named³dependee´³refµ„³ServiceState„„„„„„³embeddedType´³refµ³	EntityRef„³Cap„„„µ³protocol„´³schema·³version°

³definitions·³Oid´³atom³
SignedInteger„³Sync´³rec´³lit³
S„´³tupleµ´³named³peer´³embedded´³lit<69>„„„„„„³Turn´³seqof´³refµ„³	TurnEvent„„³Error´³rec´³lit³error„´³tupleµ´³named³message´³atom³String„„´³named³detail³any„„„„³Event´³orµµ±Assert´³refµ„³Assert„„µ±Retract´³refµ„³Retract„„µ±Message´³refµ„³Message„„µ±Sync´³refµ„³Sync„„„„³Assert´³rec´³lit³
A„´³tupleµ´³named³	assertion´³refµ„³	Assertion„„´³named³handle´³refµ„³Handle„„„„„³Handle´³atom³
SignedInteger„³Packet´³orµµ±Turn´³refµ„³Turn„„µ±Error´³refµ„³Error„„µ±	Extension´³refµ„³	Extension„„„„³Message´³rec´³lit³
M„´³tupleµ´³named³body´³refµ„³	Assertion„„„„„³Retract´³rec´³lit³
R„´³tupleµ´³named³handle´³refµ„³Handle„„„„„³	Assertion³any³	Extension´³rec´³named³label³any„´³named³fields´³seqof³any„„„³	TurnEvent´³tupleµ´³named³oid´³refµ„³Oid„„´³named³event´³refµ„³Event„„„„„³embeddedType€„„µ³	dataspace„´³schema·³version°

³definitions·³Observe´³rec´³lit³Observe„´³tupleµ´³named³pattern´³refµ³dataspacePatterns„³Pattern„„´³named³observer´³embedded³any„„„„„„³embeddedType´³refµ³	EntityRef„³Cap„„„µ³
+depends-on„´³tupleµ´³named³depender³any„´³named³dependee´³refµ„³ServiceState„„„„„„³embeddedType´³refµ³	EntityRef„³Cap„„„µ³protocol„´³schema·³version°

³definitions·³Oid´³atom³
SignedInteger„³Sync´³rec´³lit³sync„´³tupleµ´³named³peer´³embedded´³lit<69>„„„„„„³Turn´³seqof´³refµ„³	TurnEvent„„³Error´³rec´³lit³error„´³tupleµ´³named³message´³atom³String„„´³named³detail³any„„„„³Event´³orµµ±Assert´³refµ„³Assert„„µ±Retract´³refµ„³Retract„„µ±Message´³refµ„³Message„„µ±Sync´³refµ„³Sync„„„„³Assert´³rec´³lit³assert„´³tupleµ´³named³	assertion´³refµ„³	Assertion„„´³named³handle´³refµ„³Handle„„„„„³Handle´³atom³
SignedInteger„³Packet´³orµµ±Turn´³refµ„³Turn„„µ±Error´³refµ„³Error„„µ±	Extension´³refµ„³	Extension„„„„³Message´³rec´³lit³message„´³tupleµ´³named³body´³refµ„³	Assertion„„„„„³Retract´³rec´³lit³retract„´³tupleµ´³named³handle´³refµ„³Handle„„„„„³	Assertion³any³	Extension´³rec´³named³label³any„´³named³fields´³seqof³any„„„³	TurnEvent´³tupleµ´³named³oid´³refµ„³Oid„„´³named³event´³refµ„³Event„„„„„³embeddedType€„„µ³	dataspace„´³schema·³version°

³definitions·³Observe´³rec´³lit³Observe„´³tupleµ´³named³pattern´³refµ³dataspacePatterns„³Pattern„„´³named³observer´³embedded³any„„„„„„³embeddedType´³refµ³	EntityRef„³Cap„„„µ³
 gatekeeper„´³schema·³version°

³definitions·³Bind´³rec´³lit³bind„´³tupleµ´³named³description´³refµ„³Description„„´³named³target´³embedded³any„„´³named³observer´³refµ„³BindObserver„„„„„³Step´³rec´³named³stepType´³atom³Symbol„„´³tupleµ´³named³detail³any„„„„³Bound´³orµµ±bound´³rec´³lit³bound„´³tupleµ´³named³pathStep´³refµ„³PathStep„„„„„„µ±Rejected´³refµ„³Rejected„„„„³Route´³rec´³lit³route„´³tuplePrefixµ´³named³
-transports´³seqof³any„„„´³named³	pathSteps´³seqof´³refµ„³PathStep„„„„„³Resolve´³rec´³lit³resolve„´³tupleµ´³named³step´³refµ„³Step„„´³named³observer´³embedded´³refµ„³Resolved„„„„„„³PathStep´³rec´³named³stepType´³atom³Symbol„„´³tupleµ´³named³detail³any„„„„³Rejected´³rec´³lit³rejected„´³tupleµ´³named³detail³any„„„„³Resolved´³orµµ±accepted´³rec´³lit³accepted„´³tupleµ´³named³responderSession´³embedded³any„„„„„„µ±Rejected´³refµ„³Rejected„„„„³Description´³rec´³named³stepType´³atom³Symbol„„´³tupleµ´³named³detail³any„„„„³ResolvePath´³rec´³lit³resolve-path„´³tupleµ´³named³route´³refµ„³Route„„´³named³addr³any„´³named³control´³embedded´³refµ„³TransportControl„„„´³named³resolved´³refµ„³Resolved„„„„„³BindObserver´³orµµ±present´³embedded´³refµ„³Bound„„„µ±absent´³lit€„„„„³ForceDisconnect´³rec´³lit³force-disconnect„´³tupleµ„„„³ResolvedPathStep´³rec´³lit³	path-step„´³tupleµ´³named³origin´³embedded´³refµ„³Resolve„„„´³named³pathStep´³refµ„³PathStep„„´³named³resolved´³refµ„³Resolved„„„„„³TransportControl´³refµ„³ForceDisconnect„³TransportConnection´³rec´³lit³connect-transport„´³tupleµ´³named³addr³any„´³named³control´³embedded´³refµ„³TransportControl„„„´³named³resolved´³refµ„³Resolved„„„„„„³embeddedType´³refµ³	EntityRef„³Cap„„„µ³transportAddress„´³schema·³version°

³definitions·³Tcp´³rec´³lit³tcp„´³tupleµ´³named³host´³atom³String„„´³named³port´³atom³
SignedInteger„„„„„³Unix´³rec´³lit³unix„´³tupleµ´³named³path´³atom³String„„„„„³Stdio´³rec´³lit³stdio„´³tupleµ„„„³	WebSocket´³rec´³lit³ws„´³tupleµ´³named³url´³atom³String„„„„„„³embeddedType€„„µ³dataspacePatterns„´³schema·³version°

³definitions·³AnyAtom´³orµµ±bool´³atom³Boolean„„µ±double´³atom³Double„„µ±int´³atom³
SignedInteger„„µ±string´³atom³String„„µ±bytes´³atom³
-ByteString„„µ±symbol´³atom³Symbol„„µ±embedded´³embedded³any„„„„³Pattern´³orµµ±discard´³rec´³lit³
_„´³tupleµ„„„„µ±bind´³rec´³lit³bind„´³tupleµ´³named³pattern´³refµ„³Pattern„„„„„„µ±lit´³rec´³lit³lit„´³tupleµ´³named³value´³refµ„³AnyAtom„„„„„„µ±group´³rec´³lit³group„´³tupleµ´³named³type´³refµ„³	GroupType„„´³named³entries´³dictof³any´³refµ„³Pattern„„„„„„„„„³	GroupType´³orµµ±rec´³rec´³lit³rec„´³tupleµ´³named³label³any„„„„„µ±arr´³rec´³lit³arr„´³tupleµ„„„„µ±dict´³rec´³lit³dict„´³tupleµ„„„„„„„³embeddedType´³refµ³	EntityRef„³Cap„„„„„
+transports´³seqof³any„„„´³named³	pathSteps´³seqof´³refµ„³PathStep„„„„„³Resolve´³rec´³lit³resolve„´³tupleµ´³named³step´³refµ„³Step„„´³named³observer´³embedded´³refµ„³Resolved„„„„„„³PathStep´³rec´³named³stepType´³atom³Symbol„„´³tupleµ´³named³detail³any„„„„³Rejected´³rec´³lit³rejected„´³tupleµ´³named³detail³any„„„„³Resolved´³orµµ±accepted´³rec´³lit³accepted„´³tupleµ´³named³responderSession´³embedded³any„„„„„„µ±Rejected´³refµ„³Rejected„„„„³Description´³rec´³named³stepType´³atom³Symbol„„´³tupleµ´³named³detail³any„„„„³ResolvePath´³rec´³lit³resolve-path„´³tupleµ´³named³route´³refµ„³Route„„´³named³addr³any„´³named³control´³embedded´³refµ„³TransportControl„„„´³named³resolved´³refµ„³Resolved„„„„„³BindObserver´³orµµ±present´³embedded´³refµ„³Bound„„„µ±absent´³lit€„„„„³ForceDisconnect´³rec´³lit³force-disconnect„´³tupleµ„„„³ResolvedPathStep´³rec´³lit³	path-step„´³tupleµ´³named³origin´³embedded´³refµ„³Resolve„„„´³named³pathStep´³refµ„³PathStep„„´³named³resolved´³refµ„³Resolved„„„„„³TransportControl´³refµ„³ForceDisconnect„³TransportConnection´³rec´³lit³connect-transport„´³tupleµ´³named³addr³any„´³named³control´³embedded´³refµ„³TransportControl„„„´³named³resolved´³refµ„³Resolved„„„„„„³embeddedType´³refµ³	EntityRef„³Cap„„„µ³transportAddress„´³schema·³version°

³definitions·³Tcp´³rec´³lit³tcp„´³tupleµ´³named³host´³atom³String„„´³named³port´³atom³
SignedInteger„„„„„³Unix´³rec´³lit³unix„´³tupleµ´³named³path´³atom³String„„„„„³Stdio´³rec´³lit³stdio„´³tupleµ„„„³	WebSocket´³rec´³lit³ws„´³tupleµ´³named³url´³atom³String„„„„„„³embeddedType€„„µ³dataspacePatterns„´³schema·³version°

³definitions·³DLit´³rec´³lit³lit„´³tupleµ´³named³value´³refµ„³AnyAtom„„„„„³DBind´³rec´³lit³bind„´³tupleµ´³named³pattern´³refµ„³Pattern„„„„„³AnyAtom´³orµµ±bool´³atom³Boolean„„µ±float´³atom³Float„„µ±double´³atom³Double„„µ±int´³atom³
SignedInteger„„µ±string´³atom³String„„µ±bytes´³atom³
+ByteString„„µ±symbol´³atom³Symbol„„µ±embedded´³embedded³any„„„„³Pattern´³orµµ±DDiscard´³refµ„³DDiscard„„µ±DBind´³refµ„³DBind„„µ±DLit´³refµ„³DLit„„µ±	DCompound´³refµ„³	DCompound„„„„³DDiscard´³rec´³lit³
_„´³tupleµ„„„³	DCompound´³orµµ±rec´³rec´³lit³rec„´³tupleµ´³named³label³any„´³named³fields´³seqof´³refµ„³Pattern„„„„„„„µ±arr´³rec´³lit³arr„´³tupleµ´³named³items´³seqof´³refµ„³Pattern„„„„„„„µ±dict´³rec´³lit³dict„´³tupleµ´³named³entries´³dictof³any´³refµ„³Pattern„„„„„„„„„„³embeddedType´³refµ³	EntityRef„³Cap„„„„„

syndicate/protocols/schemas/dataspace.prs

@@ -1,4 +1,4 @@
 version 1 .
 embeddedType EntityRef.Cap .
 
-Observe = <Observe @pattern dataspacePatterns.Pattern @observer #:any>.
+Observe = <Observe @pattern dataspacePatterns.Pattern @observer #!any>.

syndicate/protocols/schemas/dataspacePatterns.prs

@@ -1,30 +1,23 @@
 version 1 .
 embeddedType EntityRef.Cap .
 
-# Dataspace patterns: *almost* a sublanguage of attenuation patterns.
-#
-# One key difference is that Dataspace patterns are extensible, in that
-# they ignore fields not mentioned in group patterns.
+# Dataspace patterns: a sublanguage of attenuation patterns.
+Pattern = DDiscard / DBind / DLit / DCompound .
 
-Pattern =
-    / @discard <_>
-    / <bind @pattern Pattern>
-    / <lit @value AnyAtom>
-    / <group @type GroupType @entries { any: Pattern ...:... }>
-.
-
-GroupType =
-    / <rec @label any>
-    / <arr>
-    / <dict>
-.
+DDiscard = <_>.
+DBind = <bind @pattern Pattern>.
+DLit = <lit @value AnyAtom>.
+DCompound = <rec @label any @fields [Pattern ...]>
+          / <arr @items [Pattern ...]>
+          / <dict @entries { any: Pattern ...:... }> .
 
 AnyAtom =
     / @bool bool
+    / @float float
     / @double double
     / @int int
     / @string string
     / @bytes bytes
     / @symbol symbol
-    / @embedded #:any
+    / @embedded #!any
 .

syndicate/protocols/schemas/gatekeeper.prs

@@ -6,47 +6,18 @@ embeddedType EntityRef.Cap .
 
 # Assertion. Gatekeeper will attempt to resolve `step`, responding with a `Resolved` to
 # `observer`.
-Resolve = <resolve @step Step @observer #:Resolved> .
-Resolved = <accepted @responderSession #:any> / Rejected .
+Resolve = <resolve @step Step @observer #!Resolved> .
+Resolved = <accepted @responderSession #!any> / Rejected .
 Step = <<rec> @stepType symbol [@detail any]> .
 
 # ---------------------------------------------------------------------------
 # Protocol at dataspaces *associated* with gatekeeper entities
 
-# ## Handling `Resolve` requests
-#
-# When the gatekeeper entity receives a `Resolve` assertion (call it R1), it
-#
-#  1. asserts a `Resolve` (call it R2) into its associated dataspace that
-#     is the same as R1 except it has a different `observer`; and
-#
-#  2. observes a `Bind` with `description` matching the `step` of R1/R2
-#     according to `stepType` (e.g. treatment of SturdyStepType is not the
-#     same as treatment of NoiseStepType).
-#
-# Normally, an appropriate `Bind` is expected to exist. If the gatekeeper
-# sees the `Bind` first, it takes the `target` from it and does whatever
-# `stepType` mandates before replying to R1's observer.
-#
-# However, if a `Resolved` is asserted to R2's observer before a `Bind`
-# appears, that resolution is relayed on to R1's observer directly, be it
-# positive or negative, and the gatekeeper stops waiting for a `Bind`.
-#
-# This way, entities can keep an eye out for `Resolve` requests that will
-# never complete, and answer `Rejected` to them even when no matching
-# `Bind` exists. Entities could also use `Resolve` requests to synthesize a
-# `Bind` in a "just-in-time" fashion.
-#
-# ## General treatment of `Bind` assertions
-#
-# When the gatekeeper sees a `Bind`, independently of any potential
-# `Resolve` requests, it computes an appropriate PathStep from
-# `description` pointing at `target`, and responds with a `Bound` to
-# `observer` (if supplied).
-#
-Bind = <bind @description Description @target #:any @observer BindObserver> .
+# Assertion. Gatekeeper will compute an appropriate PathStep from `description` pointing at
+# `target`, and will respond with a `Bound` to `observer` (if supplied).
+Bind = <bind @description Description @target #!any @observer BindObserver> .
 Description = <<rec> @stepType symbol [@detail any]> .
-BindObserver = @present #:Bound / @absent #f .
+BindObserver = @present #!Bound / @absent #f .
 Bound = <bound @pathStep PathStep> / Rejected .
 
 # ---------------------------------------------------------------------------
@@ -56,10 +27,10 @@ Bound = <bound @pathStep PathStep> / Rejected .
 # and `resolved`, respondent will follow `route.pathSteps` starting from one of the
 # `route.transports`, asserting `ResolvePath` with the final `Resolved` as well as the selected
 # transport `addr` and a `control` for it.
-ResolvePath = <resolve-path @route Route @addr any @control #:TransportControl @resolved Resolved> .
+ResolvePath = <resolve-path @route Route @addr any @control #!TransportControl @resolved Resolved> .
 
-TransportConnection = <connect-transport @addr any @control #:TransportControl @resolved Resolved> .
-ResolvedPathStep = <path-step @origin #:Resolve @pathStep PathStep @resolved Resolved> .
+TransportConnection = <connect-transport @addr any @control #!TransportControl @resolved Resolved> .
+ResolvedPathStep = <path-step @origin #!Resolve @pathStep PathStep @resolved Resolved> .
 PathStep = <<rec> @stepType symbol [@detail any]> .
 
 # A `Route` describes a network path that can be followed to reach some target entity.

syndicate/protocols/schemas/http.prs

@@ -2,7 +2,7 @@ version 1 .
 
 # Assertion in driver DS
 # Causes creation of server and route
-HttpBinding = <http-bind @host HostPattern @port int @method MethodPattern @path PathPattern @handler #:HttpRequest> .
+HttpBinding = <http-bind @host HostPattern @port int @method MethodPattern @path PathPattern @handler #!HttpRequest> .
 
 # Assertion in driver DS
 # Describes active server and route
@@ -21,7 +21,7 @@ MethodPattern = @any #f / @specific @"Lowercase" symbol .
 # Assertion in driver DS
 HttpRequest = <http-request
                @sequenceNumber int
-               @host RequestHost
+               @host string
                @port int
                @method @"Lowercase" symbol
                @path [string ...]
@@ -32,24 +32,13 @@ HttpRequest = <http-request
 Headers = {@"Lowercase" symbol: string ...:...} .
 QueryValue = @string string / <file @filename string @headers Headers @body bytes> .
 RequestBody = @present bytes / @absent #f .
-RequestHost = @present string / @absent #f .
 
 # Assertion to handler entity
-HttpContext = <request @req HttpRequest @res #:HttpResponse> .
+HttpContext = <request @req HttpRequest @res #!HttpResponse> .
 
-# HttpResponse protocol. Delivered to the `res` ref in `HttpContext`.
-#
-#     (status | header)* . chunk* . done
-#
-# Done triggers completion of the response and retraction of the frame by the peer. If the
-# HttpBinding responsible for the request is withdrawn mid-way through a response (i.e. when
-# chunked transfer is used and at least one chunk has been sent) the request is abruptly
-# closed; if it is withdrawn at any other moment in the lifetime of the request, a 500 Internal
-# Server Error is send to the client.
-#
 @<TODO "trailers?">
+# Messages
 HttpResponse =
-# Messages.
 / <status @code int @message string>
 / <header @name symbol @value string>
 / <chunk @chunk Chunk>

syndicate/protocols/schemas/noise.prs

@@ -1,5 +1,4 @@
 version 1 .
-embeddedType EntityRef.Cap .
 
 # https://noiseprotocol.org/
 
@@ -43,30 +42,13 @@ DefaultProtocol = "Noise_NK_25519_ChaChaPoly_BLAKE2s" .
 # sequence is exhausted or not supplied, an all-zeros key is used each time a PSK is needed.
 NoisePreSharedKeys = @present { preSharedKeys: [bytes ...] } / @invalid { preSharedKeys: any } / @absent {} .
 
-# ---------------------------------------------------------------------------
-# Handshaking and running a session
-
-# 1. initiator asserts <resolve <noise ServiceSelector> #:A> at Gatekeeper
-# 2. gatekeeper asserts <accepted #:B> at #:A
-# 3. initiator asserts <initiator #:C> at #:B and then sends `Packet`s to #:B
-# 4. responder sends `Packet`s to #:C
-#
-# Sessions begin with introduction of initiator (#:C) and responder (#:B) to each other, and
-# then proceed by sending `Packet`s (from #:C) to #:B and (from #:B) to #:C according to
-# the Noise protocol definition. Each `Packet` represents a complete logical unit of
+# Sessions proceed by sending Packets to the initiatorSession and responderSession according to
+# the Noise protocol definition. Each Packet represents a complete logical unit of
 # communication; for example, a complete Turn when layering the Syndicate protocol over Noise.
 # Note well the restriction on Noise messages: no individual complete packet or packet fragment
-# may exceed 65535 bytes (N.B. not 65536!). When `fragmented`, each portion of a `Packet` is a
+# may exceed 65535 bytes (N.B. not 65536!). When `fragmented`, each portion of a Packet is a
 # complete Noise "transport message"; when `complete`, the whole thing is likewise a complete
 # "transport message".
-#
-# Retraction of the `Initiator` ends the session from the initiator-side; retraction of the
-# `<accepted ...>` assertion ends the session from the responder-side.
-
-SessionItem = Initiator / Packet .
-# Assertion
-Initiator = <initiator @initiatorSession #:Packet> .
-# Message
 Packet = @complete bytes / @fragmented [bytes ...] .
 
 # When layering Syndicate protocol over noise,

syndicate/protocols/schemas/protocol.prs

@@ -13,7 +13,7 @@ Oid       = int .
 Turn      = [TurnEvent ...].
 TurnEvent = [@oid Oid @event Event].
 
-Assert  = <A @assertion Assertion @handle Handle>.
-Retract = <R @handle Handle>.
-Message = <M @body Assertion>.
-Sync    = <S @peer #:#t>.
+Assert = <assert @assertion Assertion @handle Handle>.
+Retract = <retract @handle Handle>.
+Message = <message @body Assertion>.
+Sync = <sync @peer #!#t>.

syndicate/protocols/schemas/stdenv.prs

@@ -1,31 +0,0 @@
-version 1 .
-
-# A "standard" route is
-#
-# - a collection of websocket urls, for transport.
-# - a noise tunnel, for server authentication, confidentiality and integrity.
-# - a macaroon, for authorization.
-#
-# Making these choices allows a compact representation. Encoding a binary-syntax representation
-# of a standard route using base64 produces a somewhat-convenient blob of text representing
-# access to a network object that users can cut and paste.
-#
-# A `stdenv.StandardRoute.standard` can be rewritten to a `gatekeeper.Route` like this (with
-# `$caveats`, if any, added as appropriate):
-#
-#     <route $transports <noise { service: $service key: $key }> <ref { sig: $sig oid: $oid }>>
-#
-StandardRoute =
-/ @standard [@transports [StandardTransport ...]
-             @key bytes
-             @service any
-             @sig bytes
-             @oid any
-             @caveats sturdy.Caveat ...]
-/ @general gatekeeper.Route
-.
-
-StandardTransport =
-/ @wsUrl string
-/ @other any
-.

syndicate/protocols/schemas/stream.prs

@@ -2,7 +2,7 @@ version 1 .
 embeddedType EntityRef.Cap .
 
 # Assertion:
-StreamConnection = <stream-connection @source #:Source @sink #:Sink @spec any>.
+StreamConnection = <stream-connection @source #!Source @sink #!Sink @spec any>.
 
 # Assertions:
 StreamListenerReady = <stream-listener-ready @spec any>.
@@ -13,7 +13,7 @@ StreamError = <error @message string>.
 
 Source =
   # Assertions:
-  / <sink @controller #:Sink>
+  / <sink @controller #!Sink>
   / StreamError
 
   # Messages:
@@ -22,7 +22,7 @@ Source =
 
 Sink =
   # Assertions:
-  / <source @controller #:Source>
+  / <source @controller #!Source>
   / StreamError
 
   # Messages:

syndicate/protocols/schemas/sturdy.prs

@@ -51,7 +51,7 @@ Lit = <lit @value any>.
 
 Pattern = PDiscard / PAtom / PEmbedded / PBind / PAnd / PNot / Lit / PCompound .
 PDiscard = <_>.
-PAtom = =Boolean / =Double / =SignedInteger / =String / =ByteString / =Symbol .
+PAtom = =Boolean / =Float / =Double / =SignedInteger / =String / =ByteString / =Symbol .
 PEmbedded = =Embedded .
 PBind = <bind @pattern Pattern>.
 PAnd = <and @patterns [Pattern ...]>.

syndicate/protocols/schemas/tcp.prs

@@ -4,4 +4,4 @@ embeddedType EntityRef.Cap .
 TcpRemote = <tcp-remote @host string @port int>.
 TcpLocal = <tcp-local @host string @port int>.
 
-TcpPeerInfo = <tcp-peer @handle #:any @local TcpLocal @remote TcpRemote>.
+TcpPeerInfo = <tcp-peer @handle #!any @local TcpLocal @remote TcpRemote>.

syndicate/src/bag.rs

@@ -4,7 +4,7 @@
 
 use std::collections::BTreeMap;
 use std::collections::btree_map::{Iter, Keys, Entry};
-use std::iter::FromIterator;
+use std::iter::{FromIterator, IntoIterator};
 
 /// Element counts in [`BTreeBag`]s are 32-bit signed integers.
 pub type Count = i32;

syndicate/src/dataspace.rs

@@ -12,6 +12,7 @@ use super::language;
 use super::skeleton;
 use super::actor::*;
 use super::schemas::dataspace::*;
+use super::schemas::dataspace::_Any;
 
 use preserves::value::Map;
 use preserves_schema::Codec;

syndicate/src/during.rs

@@ -175,7 +175,7 @@ where
             t.on_stop_notify(&r);
         }
         if should_register_exit_hook {
-            t.add_exit_hook(&r);
+            t.state.add_exit_hook(&r);
         }
         r
     }

syndicate/src/lib.rs

@@ -74,7 +74,7 @@ mod protocol_test {
     use preserves_schema::Deserialize;
 
     #[test] fn decode_sync() {
-        let input_str = "[[2 <S #:[0 11]>]]";
+        let input_str = "[[2 <sync #![0 11]>]]";
         let mut src = BytesBinarySource::new(input_str.as_bytes());
         let mut r = src.text::<IOValue, _>(ViaCodec::new(IOValueDomainCodec));
         let packet: schemas::protocol::Packet<IOValue> = schemas::protocol::Packet::deserialize(&mut r).unwrap();

syndicate/src/pattern.rs

@@ -1,5 +1,3 @@
-use std::sync::Arc;
-
 use crate::schemas::dataspace_patterns::*;
 
 use super::language;
@@ -10,25 +8,23 @@ use preserves::value::Record;
 use preserves::value::Value;
 use preserves_schema::Codec;
 
-pub type PathStep = _Any;
+#[derive(Debug, Clone, PartialOrd, Ord, PartialEq, Eq)]
+pub enum PathStep {
+    Index(usize),
+    Key(_Any),
+}
+
 pub type Path = Vec<PathStep>;
 pub type Paths = Vec<Path>;
 
-#[derive(Debug, PartialEq, Eq, PartialOrd, Ord)]
-pub struct ConstantPositions {
-    pub with_values: Paths,
-    pub required_to_exist: Paths,
-}
-
 struct Analyzer {
     pub const_paths: Paths,
     pub const_values: Vec<_Any>,
-    pub checked_paths: Paths,
     pub capture_paths: Paths,
 }
 
 pub struct PatternAnalysis {
-    pub const_positions: Arc<ConstantPositions>,
+    pub const_paths: Paths,
     pub const_values: _Any,
     pub capture_paths: Paths,
 }
@@ -42,15 +38,11 @@ impl PatternAnalysis {
         let mut analyzer = Analyzer {
             const_paths: Vec::new(),
             const_values: Vec::new(),
-            checked_paths: Vec::new(),
             capture_paths: Vec::new(),
         };
         analyzer.walk(&mut Vec::new(), p);
         PatternAnalysis {
-            const_positions: Arc::new(ConstantPositions {
-                with_values: analyzer.const_paths,
-                required_to_exist: analyzer.checked_paths,
-            }),
+            const_paths: analyzer.const_paths,
             const_values: _Any::new(analyzer.const_values),
             capture_paths: analyzer.capture_paths,
         }
@@ -66,21 +58,34 @@ impl Analyzer {
 
     fn walk(&mut self, path: &mut Path, p: &Pattern) {
         match p {
-            Pattern::Group { entries, .. } => {
-                for (k, p) in entries {
-                    self.walk_step(path, k.clone(), p)
+            Pattern::DCompound(b) => match &**b {
+                DCompound::Rec { fields, .. } => {
+                    for (i, p) in fields.iter().enumerate() {
+                        self.walk_step(path, PathStep::Index(i), p);
+                    }
+                }
+                DCompound::Arr { items, .. } => {
+                    for (i, p) in items.iter().enumerate() {
+                        self.walk_step(path, PathStep::Index(i), p);
+                    }
+                }
+                DCompound::Dict { entries, .. } => {
+                    for (k, p) in entries {
+                        self.walk_step(path, PathStep::Key(k.clone()), p);
+                    }
                 }
             }
-            Pattern::Bind { pattern } => {
+            Pattern::DBind(b) => {
+                let DBind { pattern, .. } = &**b;
                 self.capture_paths.push(path.clone());
-                self.walk(path, &**pattern);
+                self.walk(path, pattern)
             }
-            Pattern::Discard => {
-                self.checked_paths.push(path.clone());
-            }
-            Pattern::Lit { value } => {
+            Pattern::DDiscard(_) =>
+                (),
+            Pattern::DLit(b) => {
+                let DLit { value } = &**b;
                 self.const_paths.push(path.clone());
-                self.const_values.push(language().unparse(&**value));
+                self.const_values.push(language().unparse(value));
             }
         }
     }
@@ -104,47 +109,52 @@ impl PatternMatcher {
         }
     }
 
-    fn run_seq<'a, F: 'a + Fn(usize) -> &'a _Any>(&mut self, entries: &Map<_Any, Pattern<_Any>>, values: F) -> bool {
-        for (k, p) in entries {
-            match k.value().as_usize() {
-                None => return false,
-                Some(i) => if !self.run(p, values(i)) {
-                    return false;
-                }
-            }
-        }
-        true
-    }
-
     fn run(&mut self, pattern: &Pattern<_Any>, value: &_Any) -> bool {
         match pattern {
-            Pattern::Discard => true,
-            Pattern::Bind { pattern } => {
+            Pattern::DDiscard(_) => true,
+            Pattern::DBind(b) => {
                 self.captures.push(value.clone());
-                self.run(&**pattern, value)
+                self.run(&b.pattern, value)
             }
-            Pattern::Lit { value: expected } => value == &language().unparse(&**expected),
-            Pattern::Group { type_, entries } => match &**type_ {
-                GroupType::Rec { label } => {
-                    match value.value().as_record(None) {
+            Pattern::DLit(b) => value == &language().unparse(&b.value),
+            Pattern::DCompound(b) => match &**b {
+                DCompound::Rec { label, fields } => {
+                    match value.value().as_record(Some(fields.len())) {
                         None => false,
-                        Some(r) =>
-                            r.label() == label &&
-                            self.run_seq(entries, |i| &r.fields()[i])
+                        Some(r) => {
+                            if r.label() != label {
+                                return false;
+                            }
+                            for (i, p) in fields.iter().enumerate() {
+                                if !self.run(p, &r.fields()[i]) {
+                                    return false;
+                                }
+                            }
+                            true
+                        }
                     }
                 }
-                GroupType::Arr => {
+                DCompound::Arr { items } => {
                     match value.value().as_sequence() {
                         None => false,
-                        Some(vs) =>
-                            self.run_seq(entries, |i| &vs[i])
+                        Some(vs) => {
+                            if vs.len() != items.len() {
+                                return false;
+                            }
+                            for (i, p) in items.iter().enumerate() {
+                                if !self.run(p, &vs[i]) {
+                                    return false;
+                                }
+                            }
+                            true
+                        }
                     }
                 }
-                GroupType::Dict => {
+                DCompound::Dict { entries: expected_entries } => {
                     match value.value().as_dictionary() {
                         None => false,
                         Some(actual_entries) => {
-                            for (k, p) in entries {
+                            for (k, p) in expected_entries.iter() {
                                 if !actual_entries.get(k).map(|v| self.run(p, v)).unwrap_or(false) {
                                     return false;
                                 }
@@ -160,68 +170,42 @@ impl PatternMatcher {
 
 pub fn lift_literal(v: &_Any) -> Pattern {
     match v.value() {
-        Value::Record(r) => Pattern::Group {
-            type_: Box::new(GroupType::Rec { label: r.label().clone() }),
-            entries: r.fields().iter().enumerate()
-                .map(|(i, v)| (_Any::new(i), lift_literal(v)))
-                .collect(),
-        },
-        Value::Sequence(items) => Pattern::Group {
-            type_: Box::new(GroupType::Arr),
-            entries: items.iter().enumerate()
-                .map(|(i, v)| (_Any::new(i), lift_literal(v)))
-                .collect(),
-        },
+        Value::Record(r) => Pattern::DCompound(Box::new(DCompound::Rec {
+            label: r.label().clone(),
+            fields: r.fields().iter().map(lift_literal).collect(),
+        })),
+        Value::Sequence(items) => Pattern::DCompound(Box::new(DCompound::Arr {
+            items: items.iter().map(lift_literal).collect(),
+        })),
         Value::Set(_members) => panic!("Cannot express literal set in pattern"),
-        Value::Dictionary(entries) => Pattern::Group {
-            type_: Box::new(GroupType::Dict),
-            entries: entries.iter()
-                .map(|(k, v)| (k.clone(), lift_literal(v)))
-                .collect(),
-        },
-        _other => Pattern::Lit {
-            value: Box::new(language().parse(v).expect("Non-compound datum can be converted to AnyAtom")),
-        },
+        Value::Dictionary(entries) => Pattern::DCompound(Box::new(DCompound::Dict {
+            entries: entries.iter().map(|(k, v)| (k.clone(), lift_literal(v))).collect(),
+        })),
+        _other => Pattern::DLit(Box::new(DLit {
+            value: language().parse(v).expect("Non-compound datum can be converted to AnyAtom"),
+        })),
     }
 }
 
-const DISCARD: Pattern = Pattern::Discard;
-
-pub fn pattern_seq_from_dictionary(entries: &Map<_Any, Pattern>) -> Option<Vec<&Pattern>> {
-    let mut max_k: Option<usize> = None;
-    for k in entries.keys() {
-        max_k = max_k.max(Some(k.value().as_usize()?));
-    }
-    let mut seq = vec![];
-    if let Some(max_k) = max_k {
-        seq.reserve(max_k + 1);
-        for i in 0..=max_k {
-            seq.push(entries.get(&_Any::new(i)).unwrap_or(&DISCARD));
-        }
-    }
-    return Some(seq);
-}
-
-fn drop_literal_entries_seq(mut seq: Vec<_Any>, entries: &Map<_Any, Pattern>) -> Option<Vec<_Any>> {
-    for p in pattern_seq_from_dictionary(entries)?.into_iter() {
-        seq.push(drop_literal(p)?);
-    }
-    Some(seq)
-}
-
 pub fn drop_literal(p: &Pattern) -> Option<_Any> {
     match p {
-        Pattern::Group { type_, entries } => match &**type_ {
-            GroupType::Rec { label } =>
-                Some(Value::Record(Record(drop_literal_entries_seq(vec![label.clone()], entries)?)).wrap()),
-            GroupType::Arr =>
-                Some(Value::Sequence(drop_literal_entries_seq(vec![], entries)?).wrap()),
-            GroupType::Dict =>
-            Some(Value::Dictionary(entries.iter()
-                .map(|(k, p)| Some((k.clone(), drop_literal(p)?)))
-                .collect::<Option<Map<_Any, _Any>>>()?).wrap()),
+        Pattern::DCompound(b) => match &**b {
+            DCompound::Rec { label, fields } => {
+                let mut r = vec![label.clone()];
+                for f in fields.iter() {
+                    r.push(drop_literal(f)?);
+                }
+                Some(Value::Record(Record(r)).wrap())
+            }
+            DCompound::Arr { items } =>
+                Some(Value::Sequence(items.iter().map(drop_literal)
+                                     .collect::<Option<Vec<_Any>>>()?).wrap()),
+            DCompound::Dict { entries } =>
+                Some(Value::Dictionary(entries.iter()
+                                       .map(|(k, p)| Some((k.clone(), drop_literal(p)?)))
+                                       .collect::<Option<Map<_Any, _Any>>>()?).wrap()),
         },
-        Pattern::Lit { value } => Some(language().unparse(&**value)),
+        Pattern::DLit(b) => Some(language().unparse(&b.value)),
         _ => None,
     }
 }

syndicate/src/relay.rs

@@ -29,7 +29,6 @@ use preserves::value::Map;
 use preserves::value::NestedValue;
 use preserves::value::NoEmbeddedDomainCodec;
 use preserves::value::PackedWriter;
-use preserves::value::Set;
 use preserves::value::TextWriter;
 use preserves::value::ViaCodec;
 use preserves::value::Writer;
@@ -77,7 +76,6 @@ struct Membranes {
     exported: Membrane,
     imported: Membrane,
     next_export_oid: usize,
-    reimported_attenuations: Map<sturdy::Oid, Set<Arc<Cap>>>,
 }
 
 pub enum Input {
@@ -114,8 +112,8 @@ struct TunnelRefEntity {
     relay_ref: TunnelRelayRef,
 }
 
-struct ActivatedMembranes<'a, 'm> {
-    turn: &'a mut Activation,
+struct ActivatedMembranes<'a, 'activation, 'm> {
+    turn: &'a mut Activation<'activation>,
     tr_ref: &'m TunnelRelayRef,
     membranes: &'m mut Membranes,
 }
@@ -174,11 +172,6 @@ impl Membrane {
         ws
     }
 
-    fn remove(&mut self, ws: &Arc<WireSymbol>) {
-        self.oid_map.remove(&ws.oid);
-        self.ref_map.remove(&ws.obj);
-    }
-
     fn insert_inert_entity(&mut self, t: &mut Activation, oid: sturdy::Oid) -> Arc<WireSymbol> {
         self.insert(oid, Cap::new(&t.inert_entity()))
     }
@@ -228,57 +221,7 @@ impl std::fmt::Debug for Membrane {
 macro_rules! dump_membranes { ($e:expr) => { tracing::trace!("membranes: {:#?}", $e); } }
 // macro_rules! dump_membranes { ($e:expr) => { (); } }
 
-/// Main entry point for stdio-based Syndicate services.
-pub async fn stdio_service<F>(f: F) -> !
-where
-    F: 'static + Send + FnOnce(&mut Activation) -> Result<Arc<Cap>, ActorError>
-{
-    let result = Actor::top(None, move |t| {
-        let service = f(t)?;
-        Ok(TunnelRelay::stdio_service(t, service))
-    }).await;
-
-    // Because we're currently using tokio::io::stdin(), which can prevent shutdown of the
-    // runtime, this routine uses std::process::exit directly as a special case. It's a
-    // stopgap: eventually, we'd like to do things Properly, as indicated in the comment
-    // attached (at the time of writing) to tokio::io::stdin(), which reads in part:
-    //
-    //    This handle is best used for non-interactive uses, such as when a file
-    //    is piped into the application. For technical reasons, `stdin` is
-    //    implemented by using an ordinary blocking read on a separate thread, and
-    //    it is impossible to cancel that read. This can make shutdown of the
-    //    runtime hang until the user presses enter.
-    //
-    //    For interactive uses, it is recommended to spawn a thread dedicated to
-    //    user input and use blocking IO directly in that thread.
-    //
-    // TODO: Revisit this.
-
-    match result {
-        Ok(Ok(())) => {
-            std::process::exit(0);
-        }
-        Ok(Err(e)) => {
-            tracing::error!("Main stdio_service actor failed: {}", e);
-            std::process::exit(1);
-        },
-        Err(e) => {
-            tracing::error!("Join of main stdio_service actor failed: {}", e);
-            std::process::exit(2);
-        }
-    }
-}
-
 impl TunnelRelay {
-    pub fn stdio_service(t: &mut Activation, service: Arc<Cap>) -> () {
-        TunnelRelay::run(t,
-                         Input::Bytes(Box::pin(tokio::io::stdin())),
-                         Output::Bytes(Box::pin(tokio::io::stdout())),
-                         Some(service),
-                         None,
-                         false);
-    }
-
     pub fn run(
         t: &mut Activation,
         i: Input,
@@ -291,7 +234,7 @@ impl TunnelRelay {
         t.linked_task(Some(AnyValue::symbol("writer")),
                       output_loop(o, output_rx));
         t.linked_task(Some(AnyValue::symbol("reader")),
-                      input_loop(t.trace_collector(), t.facet_ref(), i, tr_ref));
+                      input_loop(t.trace_collector(), t.facet.clone(), i, tr_ref));
         result
     }
 
@@ -316,7 +259,6 @@ impl TunnelRelay {
                 exported: Membrane::new(WireSymbolSide::Exported),
                 imported: Membrane::new(WireSymbolSide::Imported),
                 next_export_oid: 0,
-                reimported_attenuations: Map::new(),
             },
             pending_outbound: Vec::new(),
         };
@@ -327,7 +269,7 @@ impl TunnelRelay {
             |io| Arc::clone(&tr.membranes.import_oid(t, &tr_ref, io).inc_ref().obj));
         dump_membranes!(tr.membranes);
         *tr_ref.lock() = Some(tr);
-        t.add_exit_hook(&self_entity);
+        t.state.add_exit_hook(&self_entity);
         (result, tr_ref, output_rx)
     }
 
@@ -608,10 +550,9 @@ impl Membranes {
     #[inline]
     fn release_one(&mut self, ws: Arc<WireSymbol>) -> bool {
         if ws.dec_ref() {
-            if let WireSymbolSide::Exported = ws.side {
-                self.reimported_attenuations.remove(&ws.oid);
-            }
-            self.membrane(ws.side).remove(&ws);
+            let membrane = self.membrane(ws.side);
+            membrane.oid_map.remove(&ws.oid);
+            membrane.ref_map.remove(&ws.obj);
             true
         } else {
             false
@@ -632,47 +573,38 @@ impl Membranes {
         src: &'src mut S,
         _read_annotations: bool,
     ) -> io::Result<Arc<Cap>> {
-        match sturdy::WireRef::deserialize(&mut src.packed(NoEmbeddedDomainCodec))? {
+        let ws = match sturdy::WireRef::deserialize(&mut src.packed(NoEmbeddedDomainCodec))? {
             sturdy::WireRef::Mine{ oid: b } => {
                 let oid = *b;
-                let ws = self.imported.oid_map.get(&oid).map(Arc::clone)
-                    .unwrap_or_else(|| self.import_oid(t, relay_ref, oid));
-                Ok(Arc::clone(&ws.inc_ref().obj))
+                self.imported.oid_map.get(&oid).map(Arc::clone)
+                    .unwrap_or_else(|| self.import_oid(t, relay_ref, oid))
             }
             sturdy::WireRef::Yours { oid: b, attenuation } => {
                 let oid = *b;
-                let ws = self.exported.oid_map.get(&oid).map(Arc::clone)
-                    .unwrap_or_else(|| self.exported.insert_inert_entity(t, oid.clone()));
-
                 if attenuation.is_empty() {
-                    Ok(Arc::clone(&ws.inc_ref().obj))
+                    self.exported.oid_map.get(&oid).map(Arc::clone).unwrap_or_else(
+                        || self.exported.insert_inert_entity(t, oid))
                 } else {
-                    let attenuated_obj = ws.obj.attenuate(&attenuation)
-                        .map_err(|e| {
-                            io::Error::new(
-                                io::ErrorKind::InvalidInput,
-                                format!("Invalid capability attenuation: {:?}", e))
-                        })?;
-
-                    ws.inc_ref();
-
-                    let variations = self.reimported_attenuations.entry(oid).or_default();
-                    match variations.get(&attenuated_obj) {
-                        None => {
-                            variations.insert(Arc::clone(&attenuated_obj));
-                            self.exported.ref_map.insert(Arc::clone(&attenuated_obj), Arc::clone(&ws));
-                            Ok(attenuated_obj)
+                    match self.exported.oid_map.get(&oid) {
+                        None => self.exported.insert_inert_entity(t, oid),
+                        Some(ws) => {
+                            let attenuated_obj = ws.obj.attenuate(&attenuation)
+                                .map_err(|e| {
+                                    io::Error::new(
+                                        io::ErrorKind::InvalidInput,
+                                        format!("Invalid capability attenuation: {:?}", e))
+                                })?;
+                            self.exported.insert(oid, attenuated_obj)
                         }
-                        Some(existing) =>
-                            Ok(Arc::clone(existing))
                     }
                 }
             }
-        }
+        };
+        Ok(Arc::clone(&ws.inc_ref().obj))
     }
 }
 
-impl<'a, 'm> DomainDecode<Arc<Cap>> for ActivatedMembranes<'a, 'm> {
+impl<'a, 'activation, 'm> DomainDecode<Arc<Cap>> for ActivatedMembranes<'a, 'activation, 'm> {
     fn decode_embedded<'de, 'src, S: BinarySource<'de>>(
         &mut self,
         src: &'src mut S,
@@ -753,12 +685,12 @@ async fn input_loop(
                 buf.reserve(BUFSIZE);
                 let n = match r.read_buf(&mut buf).await {
                     Ok(n) => n,
-                    Err(e) => {
+                    Err(e) =>
                         if e.kind() == io::ErrorKind::ConnectionReset {
                             break;
-                        }
-                        return Err(e)?;
-                    }
+                        } else {
+                            return Err(e)?;
+                        },
                 };
                 match n {
                     0 => break,
@@ -803,7 +735,7 @@ async fn output_loop(
 
 impl Entity<()> for TunnelRefEntity {
     fn exit_hook(&mut self, t: &mut Activation, exit_status: &Arc<ExitStatus>) {
-        if let ExitStatus::Error(e) = &**exit_status {
+        if let Err(e) = &**exit_status {
             let e = e.clone();
             let mut g = self.relay_ref.lock();
             let tr = g.as_mut().expect("initialized");

syndicate/src/rewrite.rs

@@ -121,6 +121,7 @@ impl Pattern {
             Pattern::PDiscard(_) => true,
             Pattern::PAtom(b) => match &**b {
                 PAtom::Boolean => a.value().is_boolean(),
+                PAtom::Float => a.value().is_float(),
                 PAtom::Double => a.value().is_double(),
                 PAtom::SignedInteger => a.value().is_signedinteger(),
                 PAtom::String => a.value().is_string(),

syndicate/src/skeleton.rs

@@ -16,12 +16,19 @@ use crate::actor::Activation;
 use crate::actor::Handle;
 use crate::actor::Cap;
 use crate::schemas::dataspace_patterns as ds;
-use crate::pattern::{self, ConstantPositions, PathStep, Path, Paths};
+use crate::pattern::{self, PathStep, Path, Paths};
 
 type Bag<A> = bag::BTreeBag<A>;
 
 type Captures = AnyValue;
 
+#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone)]
+enum Guard {
+    Rec(AnyValue, usize),
+    Seq(usize),
+    Map,
+}
+
 /// Index of assertions and [`Observe`rs][crate::schemas::dataspace::Observe].
 ///
 /// Generally speaking, you will not need to use this structure;
@@ -37,13 +44,13 @@ pub struct Index {
 #[derive(Debug)]
 struct Node {
     continuation: Continuation,
-    edges: Map<Selector, Map<ds::GroupType, Node>>,
+    edges: Map<Selector, Map<Guard, Node>>,
 }
 
 #[derive(Debug)]
 struct Continuation {
     cached_assertions: Set<AnyValue>,
-    leaf_map: Map<Arc<ConstantPositions>, Map<Captures, Leaf>>,
+    leaf_map: Map<Paths, Map<Captures, Leaf>>,
 }
 
 #[derive(Debug, PartialEq, Eq, PartialOrd, Ord)]
@@ -198,7 +205,7 @@ impl Node {
     }
 
     fn extend(&mut self, pat: &ds::Pattern) -> &mut Continuation {
-        let (_pop_count, final_node) = self.extend_walk(&mut Vec::new(), 0, PathStep::new(0), pat);
+        let (_pop_count, final_node) = self.extend_walk(&mut Vec::new(), 0, PathStep::Index(0), pat);
         &mut final_node.continuation
     }
 
@@ -209,13 +216,23 @@ impl Node {
         step: PathStep,
         pat: &ds::Pattern,
     ) -> (usize, &mut Node) {
-        let (guard, members): (ds::GroupType, Vec<(PathStep, &ds::Pattern)>) = match pat {
-            ds::Pattern::Group { type_, entries } =>
-                ((&**type_).clone(),
-                 entries.iter().map(|(k, p)| (k.clone(), p)).collect()),
-            ds::Pattern::Bind { pattern } =>
-                return self.extend_walk(path, pop_count, step, &**pattern),
-            ds::Pattern::Discard | ds::Pattern::Lit { .. } =>
+        let (guard, members): (Guard, Vec<(PathStep, &ds::Pattern)>) = match pat {
+            ds::Pattern::DCompound(b) => match &**b {
+                ds::DCompound::Arr { items } =>
+                    (Guard::Seq(items.len()),
+                     items.iter().enumerate().map(|(i, p)| (PathStep::Index(i), p)).collect()),
+                ds::DCompound::Rec { label, fields } =>
+                    (Guard::Rec(label.clone(), fields.len()),
+                     fields.iter().enumerate().map(|(i, p)| (PathStep::Index(i), p)).collect()),
+                ds::DCompound::Dict { entries, .. } =>
+                    (Guard::Map,
+                     entries.iter().map(|(k, p)| (PathStep::Key(k.clone()), p)).collect()),
+            }
+            ds::Pattern::DBind(b) => {
+                let ds::DBind { pattern, .. } = &**b;
+                return self.extend_walk(path, pop_count, step, pattern);
+            }
+            ds::Pattern::DDiscard(_) | ds::Pattern::DLit(_) =>
                 return (pop_count, self),
         };
 
@@ -319,46 +336,41 @@ where FCont: FnMut(&mut Continuation, &AnyValue) -> (),
 
     fn continuation(&mut self, c: &mut Continuation) {
         (self.m_cont)(c, self.outer_value);
-        let mut empty_const_positions = Vec::new();
-        for (const_positions, const_val_map) in &mut c.leaf_map {
-            if project_paths(self.outer_value, &const_positions.required_to_exist).is_none() {
-                continue;
-            }
-            let const_vals = match project_paths(self.outer_value, &const_positions.with_values) {
-                Some(vs) => vs,
-                None => continue,
-            };
-            let leaf_opt = if self.create_leaf_if_absent {
-                Some(const_val_map.entry(const_vals.clone()).or_insert_with(Leaf::new))
-            } else {
-                const_val_map.get_mut(&const_vals)
-            };
-            if let Some(leaf) = leaf_opt {
-                (self.m_leaf)(leaf, self.outer_value);
-                for (capture_paths, endpoints) in &mut leaf.endpoints_map {
-                    if let Some(cs) = project_paths(self.outer_value, &capture_paths) {
-                        (self.m_endpoints)(endpoints, cs);
+        let mut empty_const_paths = Vec::new();
+        for (const_paths, const_val_map) in &mut c.leaf_map {
+            if let Some(const_vals) = project_paths(self.outer_value, const_paths) {
+                let leaf_opt = if self.create_leaf_if_absent {
+                    Some(const_val_map.entry(const_vals.clone()).or_insert_with(Leaf::new))
+                } else {
+                    const_val_map.get_mut(&const_vals)
+                };
+                if let Some(leaf) = leaf_opt {
+                    (self.m_leaf)(leaf, self.outer_value);
+                    for (capture_paths, endpoints) in &mut leaf.endpoints_map {
+                        if let Some(cs) = project_paths(self.outer_value, &capture_paths) {
+                            (self.m_endpoints)(endpoints, cs);
+                        }
                     }
-                }
-                if leaf.is_empty() {
-                    const_val_map.remove(&const_vals);
-                    if const_val_map.is_empty() {
-                        empty_const_positions.push(const_positions.clone());
+                    if leaf.is_empty() {
+                        const_val_map.remove(&const_vals);
+                        if const_val_map.is_empty() {
+                            empty_const_paths.push(const_paths.clone());
+                        }
                     }
                 }
             }
         }
-        for const_positions in empty_const_positions {
-            c.leaf_map.remove(&const_positions);
+        for const_paths in empty_const_paths {
+            c.leaf_map.remove(&const_paths);
         }
     }
 }
 
-fn class_of(v: &AnyValue) -> Option<ds::GroupType> {
+fn class_of(v: &AnyValue) -> Option<Guard> {
     match v.value() {
-        Value::Sequence(_) => Some(ds::GroupType::Arr),
-        Value::Record(r) => Some(ds::GroupType::Rec { label: r.label().clone() }),
-        Value::Dictionary(_) => Some(ds::GroupType::Dict),
+        Value::Sequence(vs) => Some(Guard::Seq(vs.len())),
+        Value::Record(r) => Some(Guard::Rec(r.label().clone(), r.arity())),
+        Value::Dictionary(_) => Some(Guard::Map),
         _ => None,
     }
 }
@@ -386,17 +398,15 @@ fn project_paths<'a>(v: &'a AnyValue, ps: &Paths) -> Option<Captures> {
 }
 
 fn step<'a>(v: &'a AnyValue, s: &PathStep) -> Option<&'a AnyValue> {
-    match v.value() {
-        Value::Sequence(vs) => {
-            let i = s.value().as_usize()?;
-            if i < vs.len() { Some(&vs[i]) } else { None }
-        }
-        Value::Record(r) => {
-            let i = s.value().as_usize()?;
-            if i < r.arity() { Some(&r.fields()[i]) } else { None }
-        }
-        Value::Dictionary(m) => m.get(s),
-        _ => None,
+    match (v.value(), s) {
+        (Value::Sequence(vs), PathStep::Index(i)) =>
+            if *i < vs.len() { Some(&vs[*i]) } else { None },
+        (Value::Record(r), PathStep::Index(i)) =>
+            if *i < r.arity() { Some(&r.fields()[*i]) } else { None },
+        (Value::Dictionary(m), PathStep::Key(k)) =>
+            m.get(k),
+        _ =>
+            None,
     }
 }
 
@@ -413,14 +423,11 @@ impl Continuation {
     ) {
         let cached_assertions = &self.cached_assertions;
         let const_val_map =
-            self.leaf_map.entry(analysis.const_positions.clone()).or_insert_with({
+            self.leaf_map.entry(analysis.const_paths.clone()).or_insert_with({
                 || {
                     let mut cvm = Map::new();
                     for a in cached_assertions {
-                        if project_paths(a, &analysis.const_positions.required_to_exist).is_none() {
-                            continue;
-                        }
-                        if let Some(key) = project_paths(a, &analysis.const_positions.with_values) {
+                        if let Some(key) = project_paths(a, &analysis.const_paths) {
                             cvm.entry(key).or_insert_with(Leaf::new)
                                 .cached_assertions.insert(a.clone());
                         }
@@ -455,7 +462,7 @@ impl Continuation {
         observer: &Arc<Cap>,
     ) {
         if let Entry::Occupied(mut const_val_map_entry)
-            = self.leaf_map.entry(analysis.const_positions)
+            = self.leaf_map.entry(analysis.const_paths)
         {
             let const_val_map = const_val_map_entry.get_mut();
             if let Entry::Occupied(mut leaf_entry)

syndicate/src/sturdy.rs

@@ -2,7 +2,6 @@ use blake2::Blake2s256;
 use getrandom::getrandom;
 use hmac::{SimpleHmac, Mac};
 
-use preserves::error::io_syntax_error;
 use preserves::hex::HexParser;
 use preserves::hex::HexFormatter;
 use preserves::value::NestedValue;
@@ -38,12 +37,6 @@ impl std::fmt::Display for ValidationError {
     }
 }
 
-impl From<ValidationError> for io::Error {
-    fn from(v: ValidationError) -> Self {
-        io_syntax_error(&v.to_string())
-    }
-}
-
 impl std::error::Error for ValidationError {}
 
 const KEY_LENGTH: usize = 16; // bytes; 128 bits

syndicate/src/supervise.rs

@@ -40,7 +40,7 @@ pub struct Supervisor {
     boot_fn: Boot,
     restarts: VecDeque<Instant>,
     state: Arc<Field<State>>,
-    ac_ref: Option<ActorRef>,
+    ac_ref: Option<Actor>,
 }
 
 impl Default for SupervisorConfiguration {

syndicate/src/trace.rs

@@ -13,7 +13,6 @@ use preserves_schema::Codec;
 use super::actor::{self, AnyValue, Ref, Cap};
 use super::language;
 
-use std::num::NonZeroU64;
 use std::sync::Arc;
 use std::time::SystemTime;
 
@@ -28,8 +27,8 @@ pub struct TraceCollector {
 impl<M> From<&Ref<M>> for Target {
     fn from(v: &Ref<M>) -> Target {
         Target {
-            actor: v.mailbox.actor_id.into(),
-            facet: v.facet_id.into(),
+            actor: ActorId(AnyValue::new(v.mailbox.actor.actor_id)),
+            facet: FacetId(AnyValue::new(u64::from(v.facet_id))),
             oid: Oid(AnyValue::new(v.oid())),
         }
     }
@@ -52,7 +51,7 @@ impl TraceCollector {
         let _ = self.tx.send(TraceEntry {
             timestamp: SystemTime::now().duration_since(SystemTime::UNIX_EPOCH)
                 .expect("Time after Unix epoch").as_secs_f64().into(),
-            actor: id.into(),
+            actor: ActorId(AnyValue::new(id)),
             item: a,
         });
     }
@@ -160,15 +159,3 @@ impl From<actor::Name> for Name {
         }
     }
 }
-
-impl From<NonZeroU64> for ActorId {
-    fn from(v: NonZeroU64) -> Self {
-        ActorId(AnyValue::new(u64::from(v)))
-    }
-}
-
-impl From<NonZeroU64> for FacetId {
-    fn from(v: NonZeroU64) -> Self {
-        FacetId(AnyValue::new(u64::from(v)))
-    }
-}