Compare commits
4
Commits
actor-fs
...
8a533f0158
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8a533f0158 | ||
|
|
d0876626df | ||
|
|
c1f182d9b6 | ||
|
|
49453fa9af |
@@ -1,4 +1,4 @@
|
|||||||
# Runs on the Nix runner on nexus (label `nixos`, host executor).
|
# Runs on a self-hosted Nix runner (label `nixos`, host executor).
|
||||||
name: ci
|
name: ci
|
||||||
on: [push, pull_request]
|
on: [push, pull_request]
|
||||||
|
|
||||||
|
|||||||
+23
-3
@@ -68,7 +68,7 @@ Each instance sees three folders:
|
|||||||
| `/actor` | read-only | the `actor/` folder of the world |
|
| `/actor` | read-only | the `actor/` folder of the world |
|
||||||
|
|
||||||
`/actor/<id>/` holds everything about an actor: `actor.wasm`, `actor.json`
|
`/actor/<id>/` holds everything about an actor: `actor.wasm`, `actor.json`
|
||||||
(installed version, running, subscriptions), `source/`, `public/`, `data/`,
|
(installed version, running, subscriptions, tapped), `source/`, `public/`, `data/`,
|
||||||
`stderr.log`, and `versions/<n>/`. `ls /actor` lists all actors.
|
`stderr.log`, and `versions/<n>/`. `ls /actor` lists all actors.
|
||||||
|
|
||||||
Files are plain POSIX files: a write is visible at once. To publish a file
|
Files are plain POSIX files: a write is visible at once. To publish a file
|
||||||
@@ -109,8 +109,8 @@ Any request can be answered with `{"type": "fs_error", "errno": "no-entry"}`.
|
|||||||
|
|
||||||
Requests to `broker`. The answer is a message whose `reply_to` is the ID of
|
Requests to `broker`. The answer is a message whose `reply_to` is the ID of
|
||||||
the request: the request's `type` in past tense (`spawned`, `upgraded`,
|
the request: the request's `type` in past tense (`spawned`, `upgraded`,
|
||||||
`rolled_back`, `stopped`, `started`, `subscribed`, `unsubscribed`,
|
`rolled_back`, `stopped`, `started`, `removed`, `subscribed`, `unsubscribed`,
|
||||||
`scanned`, `exiting`), or `{"type": "error", "reason": "..."}`.
|
`tapping`, `untapped`, `scanned`, `exiting`), or `{"type": "error", "reason": "..."}`.
|
||||||
|
|
||||||
| `type` | Fields | Effect |
|
| `type` | Fields | Effect |
|
||||||
| --- | --- | --- |
|
| --- | --- | --- |
|
||||||
@@ -118,12 +118,32 @@ the request: the request's `type` in past tense (`spawned`, `upgraded`,
|
|||||||
| `upgrade` | `actor`, `wasm`, `source`?, `built_by`? | test, then swap the version |
|
| `upgrade` | `actor`, `wasm`, `source`?, `built_by`? | test, then swap the version |
|
||||||
| `rollback` | `actor`, `version` | go back to an older version |
|
| `rollback` | `actor`, `version` | go back to an older version |
|
||||||
| `stop`, `start` | `actor` | stop or start an actor |
|
| `stop`, `start` | `actor` | stop or start an actor |
|
||||||
|
| `remove` | `actor` | stop the actor (normal shutdown), then delete its whole folder `/actor/<id>/` (all versions, `data/`, `public/`, logs); answer `{"type": "removed", "actor"}`. Messages to it are then undeliverable, and the ID can be spawned again. An unknown actor or a native one (`broker`, `console`, `cargo`, `fs`) is an `error` |
|
||||||
| `subscribe`, `unsubscribe` | `actor` | receive (or not) what `actor` publishes |
|
| `subscribe`, `unsubscribe` | `actor` | receive (or not) what `actor` publishes |
|
||||||
|
| `tap`, `untap` | | receive (or not) a copy of every message the broker routes |
|
||||||
| `scan` | | boot new or changed `actor.wasm` files |
|
| `scan` | | boot new or changed `actor.wasm` files |
|
||||||
| `exit` | | answer `exiting`, stop every actor, and end the `sausage` process (a wrapper like `nix run .#loop` starts it again, updated) |
|
| `exit` | | answer `exiting`, stop every actor, and end the `sausage` process (a wrapper like `nix run .#loop` starts it again, updated) |
|
||||||
|
|
||||||
Paths are `/actor/...`, or the sender's `/public/...` or `/data/...`.
|
Paths are `/actor/...`, or the sender's `/public/...` or `/data/...`.
|
||||||
|
|
||||||
|
**Taps.** After `tap`, the sender gets a copy of every message that the
|
||||||
|
broker routes (direct messages, replies, and publishes, between any actors,
|
||||||
|
including its own), for debugging, logging, or a live view of the world:
|
||||||
|
|
||||||
|
```json
|
||||||
|
{"type": "tapped", "message": {"id": "m-17", "from": "console", "to": "agent", "reply_to": null, "body": {...}}, "ts": 1792132579067}
|
||||||
|
```
|
||||||
|
|
||||||
|
- `to` is `null` for a publish: one copy per publish, not per subscriber.
|
||||||
|
- `ts` is the time of routing, in milliseconds since the Unix epoch.
|
||||||
|
- Copies come from `broker`. They are not routed themselves, so they are
|
||||||
|
never tapped, and each message is tapped once per tapper.
|
||||||
|
- A copy that does not fit into the tapper's mailbox is dropped; routing
|
||||||
|
never waits for a tapper, and nobody gets `undeliverable` for a copy.
|
||||||
|
- Never answer a copy: the answer would be tapped again, forever.
|
||||||
|
- Like subscriptions, a tap is saved in `actor.json` (`"tapped": true`) and
|
||||||
|
survives restarts and upgrades. `untap` ends it.
|
||||||
|
|
||||||
**Versions.** A new version (from `spawn`, `upgrade`, or a changed
|
**Versions.** A new version (from `spawn`, `upgrade`, or a changed
|
||||||
`actor.wasm` on disk) is tested first, while the old version keeps running.
|
`actor.wasm` on disk) is tested first, while the old version keeps running.
|
||||||
Only when its tests pass does the broker copy it to `versions/<n>/`
|
Only when its tests pass does the broker copy it to `versions/<n>/`
|
||||||
|
|||||||
@@ -10,28 +10,43 @@ change its own code.
|
|||||||
|
|
||||||
## Start
|
## Start
|
||||||
|
|
||||||
You need [Nix](https://nixos.org/download) with flakes.
|
You need [Nix](https://nixos.org/download) with flakes, and an API token for
|
||||||
|
an LLM (OpenAI Responses or Anthropic Messages API). No clone needed:
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
nix run -- init # creates ./world and builds the agent (a few minutes)
|
nix run git+https://gitea.surma.technology/surma/sausage
|
||||||
nix run -- run # starts the world and a console
|
```
|
||||||
|
|
||||||
|
This creates a world in `./world` the first time (it builds the agent, which
|
||||||
|
takes a few minutes) and then starts it with a console. Later runs start the
|
||||||
|
existing world. The two steps also exist on their own:
|
||||||
|
|
||||||
|
```sh
|
||||||
|
nix run git+https://gitea.surma.technology/surma/sausage -- init # create ./world
|
||||||
|
nix run git+https://gitea.surma.technology/surma/sausage -- run # start it
|
||||||
```
|
```
|
||||||
|
|
||||||
`init` asks for the API shape (`openai-responses` or `anthropic-messages`),
|
`init` asks for the API shape (`openai-responses` or `anthropic-messages`),
|
||||||
the base URL, the model, and the token. It reads `SAUSAGE_API`,
|
the base URL, the model, and the token. It reads `SAUSAGE_API`,
|
||||||
`SAUSAGE_BASE_URL`, `SAUSAGE_MODEL`, and `SAUSAGE_API_TOKEN` first. The
|
`SAUSAGE_BASE_URL`, `SAUSAGE_MODEL`, and `SAUSAGE_API_TOKEN` first. The
|
||||||
values go to `world/actor/agent/data/config.json`. Both commands take another
|
values go to `world/actor/agent/data/config.json`. `init` and `run` take
|
||||||
folder as an argument, for example `nix run -- run my-world`.
|
another folder as an argument, for example `-- run my-world`.
|
||||||
|
|
||||||
To keep a world on the newest version, run it in a loop:
|
To keep a world on the newest version, run it in a loop:
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
nix run .#loop -- my-world # or .#loop-internal (Gitea on the LAN)
|
nix run git+https://gitea.surma.technology/surma/sausage#loop # ./world
|
||||||
|
nix run git+https://gitea.surma.technology/surma/sausage#loop -- my-world # an existing world
|
||||||
```
|
```
|
||||||
|
|
||||||
The loop runs `nix run --refresh git+ssh://…/surma/sausage -- run my-world`.
|
The loop runs the newest `sausage` from that URL (`nix run --refresh`).
|
||||||
When the host crashes or an actor sends `@broker {"type":"exit"}`, the loop
|
When the host crashes or an actor sends `@broker {"type":"exit"}`, the loop
|
||||||
fetches the newest commit and starts it again. `/quit` ends the loop.
|
fetches the newest commit and starts it again. `/quit` ends the loop. Set
|
||||||
|
`SAUSAGE_FLAKE` to run another flake URL instead, for example your fork.
|
||||||
|
|
||||||
|
To work on Sausage itself, clone it
|
||||||
|
(`git clone https://gitea.surma.technology/surma/sausage`) and use `nix run`,
|
||||||
|
`nix run .#loop` and `nix develop` in the checkout.
|
||||||
|
|
||||||
In the console:
|
In the console:
|
||||||
|
|
||||||
|
|||||||
+70
-8
@@ -1,6 +1,7 @@
|
|||||||
//! The broker: message routing, mailboxes, subscriptions, the version store,
|
//! The broker: message routing, mailboxes, subscriptions, taps, the version
|
||||||
//! and the requests to `broker` (spawn, upgrade, rollback, stop, start,
|
//! store, and the requests to `broker` (spawn, upgrade, rollback, stop, start,
|
||||||
//! subscribe, unsubscribe, scan, exit). `supervisor.rs` runs each WASM actor.
|
//! remove, subscribe, unsubscribe, tap, untap, scan, exit). `supervisor.rs`
|
||||||
|
//! runs each WASM actor.
|
||||||
//!
|
//!
|
||||||
//! The broker accepts only `.wasm` files. It does not know any source language.
|
//! The broker accepts only `.wasm` files. It does not know any source language.
|
||||||
//! The world folder is the source of truth: `scan` boots every
|
//! The world folder is the source of truth: `scan` boots every
|
||||||
@@ -133,17 +134,23 @@ impl Broker {
|
|||||||
Some(own) => format!("{from}/{own}"),
|
Some(own) => format!("{from}/{own}"),
|
||||||
None => format!("m-{}", self.seq.fetch_add(1, Ordering::Relaxed)),
|
None => format!("m-{}", self.seq.fetch_add(1, Ordering::Relaxed)),
|
||||||
};
|
};
|
||||||
|
let (recipients, tappers) = {
|
||||||
|
let metas = self.metas.lock().unwrap();
|
||||||
let recipients: Vec<String> = match to {
|
let recipients: Vec<String> = match to {
|
||||||
Some(to) => vec![to.to_string()],
|
Some(to) => vec![to.to_string()],
|
||||||
None => self
|
None => metas
|
||||||
.metas
|
|
||||||
.lock()
|
|
||||||
.unwrap()
|
|
||||||
.iter()
|
.iter()
|
||||||
.filter(|(_, m)| m.subscriptions.contains(from))
|
.filter(|(_, m)| m.subscriptions.contains(from))
|
||||||
.map(|(id, _)| id.clone())
|
.map(|(id, _)| id.clone())
|
||||||
.collect(),
|
.collect(),
|
||||||
};
|
};
|
||||||
|
let tappers: Vec<String> = metas.iter().filter(|(_, m)| m.tapped).map(|(id, _)| id.clone()).collect();
|
||||||
|
(recipients, tappers)
|
||||||
|
};
|
||||||
|
if !tappers.is_empty() {
|
||||||
|
let message = json!({"id": id, "from": from, "to": to, "reply_to": reply_to, "body": body});
|
||||||
|
self.tap(&tappers, message);
|
||||||
|
}
|
||||||
for to in recipients {
|
for to in recipients {
|
||||||
self.deliver(Envelope {
|
self.deliver(Envelope {
|
||||||
id: id.clone(),
|
id: id.clone(),
|
||||||
@@ -156,6 +163,25 @@ impl Broker {
|
|||||||
id
|
id
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Give every tapper a copy of one routed message. Copies skip `send`, so
|
||||||
|
/// they are never tapped themselves; a full mailbox drops the copy.
|
||||||
|
fn tap(&self, tappers: &[String], message: Value) {
|
||||||
|
let ts = std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).map_or(0, |d| d.as_millis() as u64);
|
||||||
|
let body = json!({"type": "tapped", "message": message, "ts": ts});
|
||||||
|
let mailboxes = self.mailboxes.lock().unwrap();
|
||||||
|
for tapper in tappers {
|
||||||
|
if let Some(tx) = mailboxes.get(tapper) {
|
||||||
|
let _ = tx.try_send(Envelope {
|
||||||
|
id: format!("m-{}", self.seq.fetch_add(1, Ordering::Relaxed)),
|
||||||
|
from: "broker".into(),
|
||||||
|
to: tapper.clone(),
|
||||||
|
reply_to: None,
|
||||||
|
body: body.clone(),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// Route one stdout line of a WASM actor.
|
/// Route one stdout line of a WASM actor.
|
||||||
pub fn route_line(&self, from: &str, line: &str) {
|
pub fn route_line(&self, from: &str, line: &str) {
|
||||||
let line = line.trim();
|
let line = line.trim();
|
||||||
@@ -351,6 +377,35 @@ impl Broker {
|
|||||||
Ok(result)
|
Ok(result)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Stop an actor (normal shutdown) and delete its folder `actor/<id>/`.
|
||||||
|
/// Afterwards the ID is unknown: messages to it are undeliverable, and
|
||||||
|
/// it can be spawned again from scratch.
|
||||||
|
pub async fn remove_actor(&self, id: &str) -> Result<Value> {
|
||||||
|
if NATIVE.contains(&id) {
|
||||||
|
bail!("{id} is part of the host and cannot be removed");
|
||||||
|
}
|
||||||
|
if !world::valid_id(id) {
|
||||||
|
bail!("invalid actor ID {id:?}");
|
||||||
|
}
|
||||||
|
let lock = self.op_lock(id);
|
||||||
|
let _guard = lock.lock().await;
|
||||||
|
let dir = self.world.actor_dir(id);
|
||||||
|
if !self.is_supervised(id) && !dir.is_dir() {
|
||||||
|
bail!("no actor with ID {id}");
|
||||||
|
}
|
||||||
|
if self.is_supervised(id) {
|
||||||
|
self.control(id, |reply| Control::Shutdown { reply }).await?;
|
||||||
|
}
|
||||||
|
// Without its mailbox, messages to `id` are undeliverable.
|
||||||
|
self.controls.lock().unwrap().remove(id);
|
||||||
|
self.mailboxes.lock().unwrap().remove(id);
|
||||||
|
self.metas.lock().unwrap().remove(id);
|
||||||
|
if dir.exists() {
|
||||||
|
std::fs::remove_dir_all(&dir).with_context(|| format!("delete {}", dir.display()))?;
|
||||||
|
}
|
||||||
|
Ok(json!({"type": "removed", "actor": id}))
|
||||||
|
}
|
||||||
|
|
||||||
/// Boot the actors in `actor/`. Called at start and on `scan`.
|
/// Boot the actors in `actor/`. Called at start and on `scan`.
|
||||||
///
|
///
|
||||||
/// - An `actor.wasm` equal to the installed version starts as is.
|
/// - An `actor.wasm` equal to the installed version starts as is.
|
||||||
@@ -455,6 +510,7 @@ impl Broker {
|
|||||||
}
|
}
|
||||||
"stop" => self.control(&actor()?, |reply| Control::Stop { reply }).await,
|
"stop" => self.control(&actor()?, |reply| Control::Stop { reply }).await,
|
||||||
"start" => self.control(&actor()?, |reply| Control::Start { reply }).await,
|
"start" => self.control(&actor()?, |reply| Control::Start { reply }).await,
|
||||||
|
"remove" => self.remove_actor(&actor()?).await,
|
||||||
"subscribe" | "unsubscribe" => {
|
"subscribe" | "unsubscribe" => {
|
||||||
let publisher = actor()?;
|
let publisher = actor()?;
|
||||||
let on = ty == "subscribe";
|
let on = ty == "subscribe";
|
||||||
@@ -467,6 +523,12 @@ impl Broker {
|
|||||||
})?;
|
})?;
|
||||||
Ok(json!({"type": format!("{ty}d"), "actor": publisher}))
|
Ok(json!({"type": format!("{ty}d"), "actor": publisher}))
|
||||||
}
|
}
|
||||||
|
"tap" | "untap" => {
|
||||||
|
let on = ty == "tap";
|
||||||
|
self.update_meta(&env.from, |m| m.tapped = on)?;
|
||||||
|
let answer = if on { "tapping" } else { "untapped" };
|
||||||
|
Ok(json!({"type": answer}))
|
||||||
|
}
|
||||||
"scan" => Ok(json!({"type": "scanned", "changes": self.scan().await})),
|
"scan" => Ok(json!({"type": "scanned", "changes": self.scan().await})),
|
||||||
"exit" => {
|
"exit" => {
|
||||||
self.log("broker", &format!("exit requested by {}", env.from));
|
self.log("broker", &format!("exit requested by {}", env.from));
|
||||||
@@ -474,7 +536,7 @@ impl Broker {
|
|||||||
self.exit.notify_one();
|
self.exit.notify_one();
|
||||||
Ok(json!({"type": "exiting"}))
|
Ok(json!({"type": "exiting"}))
|
||||||
}
|
}
|
||||||
other => bail!("unknown broker request {other:?}. Known: spawn, upgrade, rollback, stop, start, subscribe, unsubscribe, scan, exit"),
|
other => bail!("unknown broker request {other:?}. Known: spawn, upgrade, rollback, stop, start, remove, subscribe, unsubscribe, tap, untap, scan, exit"),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+13
-3
@@ -12,11 +12,13 @@ use sausage::{Host, cargo_actor, console};
|
|||||||
/// The source of the agent actor. `init` builds it like any other actor.
|
/// The source of the agent actor. `init` builds it like any other actor.
|
||||||
static AGENT_SOURCE: Dir<'_> = include_dir!("$CARGO_MANIFEST_DIR/../agent");
|
static AGENT_SOURCE: Dir<'_> = include_dir!("$CARGO_MANIFEST_DIR/../agent");
|
||||||
|
|
||||||
|
// Without a command, `sausage` runs the world in `./world` and creates it
|
||||||
|
// first (like `init`) if it does not exist yet.
|
||||||
#[derive(Parser)]
|
#[derive(Parser)]
|
||||||
#[command(version, about)]
|
#[command(version, about)]
|
||||||
struct Cli {
|
struct Cli {
|
||||||
#[command(subcommand)]
|
#[command(subcommand)]
|
||||||
command: Cmd,
|
command: Option<Cmd>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Subcommand)]
|
#[derive(Subcommand)]
|
||||||
@@ -112,7 +114,15 @@ async fn run(dir: PathBuf) -> Result<()> {
|
|||||||
#[tokio::main]
|
#[tokio::main]
|
||||||
async fn main() -> Result<()> {
|
async fn main() -> Result<()> {
|
||||||
match Cli::parse().command {
|
match Cli::parse().command {
|
||||||
Cmd::Init { dir } => init(dir).await,
|
Some(Cmd::Init { dir }) => init(dir).await,
|
||||||
Cmd::Run { dir } => run(dir).await,
|
Some(Cmd::Run { dir }) => run(dir).await,
|
||||||
|
None => {
|
||||||
|
let dir = PathBuf::from("world");
|
||||||
|
if !dir.join("actor").is_dir() {
|
||||||
|
println!("No world in ./world yet, creating it (same as `sausage init`).");
|
||||||
|
init(dir.clone()).await?;
|
||||||
|
}
|
||||||
|
run(dir).await
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+4
-1
@@ -5,7 +5,7 @@
|
|||||||
//! <world>/
|
//! <world>/
|
||||||
//! actor/<id>/
|
//! actor/<id>/
|
||||||
//! actor.wasm the current version
|
//! actor.wasm the current version
|
||||||
//! actor.json version, running, subscriptions (broker)
|
//! actor.json version, running, subscriptions, tapped (broker)
|
||||||
//! source/ source of the current version
|
//! source/ source of the current version
|
||||||
//! public/ written by the actor, read-only for others
|
//! public/ written by the actor, read-only for others
|
||||||
//! data/ state, writable only by the actor
|
//! data/ state, writable only by the actor
|
||||||
@@ -43,6 +43,9 @@ pub struct ActorMeta {
|
|||||||
/// The actors whose published messages this actor receives.
|
/// The actors whose published messages this actor receives.
|
||||||
#[serde(default)]
|
#[serde(default)]
|
||||||
pub subscriptions: BTreeSet<String>,
|
pub subscriptions: BTreeSet<String>,
|
||||||
|
/// Whether this actor gets a copy of every routed message (`tap`).
|
||||||
|
#[serde(default)]
|
||||||
|
pub tapped: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
fn yes() -> bool {
|
fn yes() -> bool {
|
||||||
|
|||||||
@@ -0,0 +1,41 @@
|
|||||||
|
//! Tests of the `sausage` command line.
|
||||||
|
|
||||||
|
use std::path::PathBuf;
|
||||||
|
use std::process::{Command, Stdio};
|
||||||
|
use std::time::{SystemTime, UNIX_EPOCH};
|
||||||
|
|
||||||
|
fn empty_dir(label: &str) -> PathBuf {
|
||||||
|
let nonce = SystemTime::now().duration_since(UNIX_EPOCH).unwrap().as_nanos();
|
||||||
|
let dir = PathBuf::from(env!("CARGO_MANIFEST_DIR"))
|
||||||
|
.parent()
|
||||||
|
.unwrap()
|
||||||
|
.join("target/test-cli")
|
||||||
|
.join(format!("{label}-{}-{nonce}", std::process::id()));
|
||||||
|
std::fs::create_dir_all(&dir).unwrap();
|
||||||
|
dir
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Bare `sausage` (as in `nix run <flake>`) without a world starts `init`
|
||||||
|
/// for ./world instead of printing a usage error.
|
||||||
|
#[test]
|
||||||
|
fn bare_command_without_a_world_starts_init() {
|
||||||
|
let dir = empty_dir("bare");
|
||||||
|
let output = Command::new(env!("CARGO_BIN_EXE_sausage"))
|
||||||
|
.current_dir(&dir)
|
||||||
|
.env_remove("SAUSAGE_API")
|
||||||
|
.env_remove("SAUSAGE_BASE_URL")
|
||||||
|
.env_remove("SAUSAGE_MODEL")
|
||||||
|
.env_remove("SAUSAGE_API_TOKEN")
|
||||||
|
.stdin(Stdio::null())
|
||||||
|
.output()
|
||||||
|
.unwrap();
|
||||||
|
let stdout = String::from_utf8_lossy(&output.stdout);
|
||||||
|
let stderr = String::from_utf8_lossy(&output.stderr);
|
||||||
|
// With no answers on stdin, init stops at the first required value.
|
||||||
|
assert!(!output.status.success(), "stdout:\n{stdout}\nstderr:\n{stderr}");
|
||||||
|
assert!(stdout.contains("No world in ./world yet"), "stdout:\n{stdout}\nstderr:\n{stderr}");
|
||||||
|
assert!(stderr.contains("SAUSAGE_BASE_URL"), "stdout:\n{stdout}\nstderr:\n{stderr}");
|
||||||
|
assert!(!stderr.contains("Usage:"), "stderr:\n{stderr}");
|
||||||
|
// It asks before it creates anything.
|
||||||
|
assert!(!dir.join("world").exists());
|
||||||
|
}
|
||||||
@@ -494,6 +494,62 @@ async fn explicit_rollback_keeps_current_data() {
|
|||||||
host.stop().await;
|
host.stop().await;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[tokio::test]
|
||||||
|
async fn remove_shuts_an_actor_down_and_deletes_its_folder() {
|
||||||
|
let world = create_world("remove");
|
||||||
|
let wasm = toolbox_wasm().clone();
|
||||||
|
let (host, mut mailbox) = start(&world).await;
|
||||||
|
let source = passing_source(&world, "source");
|
||||||
|
spawn_type(&host, &mut mailbox, "doomed", &wasm, &source).await;
|
||||||
|
let write = json!({"type": "write", "path": "/data/state", "text": "x"});
|
||||||
|
ask_type(&host, &mut mailbox, "doomed", write, "ok").await;
|
||||||
|
ask_type(&host, &mut mailbox, "doomed", json!({"type": "arm-shutdown"}), "armed").await;
|
||||||
|
|
||||||
|
// Normal shutdown: the actor gets "shutdown" and its last message is routed.
|
||||||
|
let id = host.broker.send("console", Some("broker"), None, None, json!({"type": "remove", "actor": "doomed"}));
|
||||||
|
let (mut removed, mut last_words) = (false, false);
|
||||||
|
tokio::time::timeout(Duration::from_secs(10), async {
|
||||||
|
while !removed || !last_words {
|
||||||
|
let message = mailbox.recv().await.expect("console mailbox closed");
|
||||||
|
if message.reply_to.as_deref() == Some(id.as_str()) {
|
||||||
|
assert_eq!(message.body, json!({"type": "removed", "actor": "doomed"}));
|
||||||
|
removed = true;
|
||||||
|
} else if message.reply_to.as_deref() == Some("broker/shutdown") {
|
||||||
|
assert_eq!(message.body["type"], "shutdown-reply");
|
||||||
|
last_words = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
.expect("remove did not answer or did not shut the actor down");
|
||||||
|
assert!(!world.actor_dir("doomed").exists());
|
||||||
|
|
||||||
|
let gone = ask(&host, &mut mailbox, "doomed", json!({"type": "echo", "value": "hi"})).await;
|
||||||
|
assert_eq!(gone.body["type"], "undeliverable");
|
||||||
|
let again = request(&host, &mut mailbox, json!({"type": "remove", "actor": "doomed"})).await;
|
||||||
|
assert_eq!(again.body["type"], "error");
|
||||||
|
let broker = request(&host, &mut mailbox, json!({"type": "remove", "actor": "broker"})).await;
|
||||||
|
assert_eq!(broker.body["type"], "error");
|
||||||
|
assert!(world.actor_dir("broker").exists());
|
||||||
|
|
||||||
|
// The ID is free again: a new spawn starts at version 1 with empty data.
|
||||||
|
assert_eq!(spawn_type(&host, &mut mailbox, "doomed", &wasm, &source).await.body["version"], 1);
|
||||||
|
let read = json!({"type": "read", "path": "/data/state"});
|
||||||
|
ask_type(&host, &mut mailbox, "doomed", read, "error").await;
|
||||||
|
host.stop().await;
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tokio::test]
|
||||||
|
async fn unknown_broker_request_lists_the_known_ones() {
|
||||||
|
let world = create_world("unknown-request");
|
||||||
|
let (host, mut mailbox) = start(&world).await;
|
||||||
|
let unknown = request(&host, &mut mailbox, json!({"type": "frobnicate"})).await;
|
||||||
|
assert_eq!(unknown.body["type"], "error");
|
||||||
|
let reason = unknown.body["reason"].as_str().unwrap();
|
||||||
|
assert!(reason.contains("remove") && reason.contains("tap"), "{reason}");
|
||||||
|
host.stop().await;
|
||||||
|
}
|
||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
async fn cargo_actor_builds_valid_crates_and_reports_compiler_errors() {
|
async fn cargo_actor_builds_valid_crates_and_reports_compiler_errors() {
|
||||||
let world = create_world("cargo-actor");
|
let world = create_world("cargo-actor");
|
||||||
@@ -742,3 +798,114 @@ async fn running_actors_have_sockets_and_candidates_do_not() {
|
|||||||
assert_eq!(answer.body, json!({"type": "tcp", "line": "echo: hi"}));
|
assert_eq!(answer.body, json!({"type": "tcp", "line": "echo: hi"}));
|
||||||
host.stop().await;
|
host.stop().await;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Every message that arrives until the mailbox is quiet for `quiet`.
|
||||||
|
async fn drain(mailbox: &mut mpsc::Receiver<Envelope>, quiet: Duration) -> Vec<Envelope> {
|
||||||
|
let mut messages = Vec::new();
|
||||||
|
while let Ok(Some(message)) = tokio::time::timeout(quiet, mailbox.recv()).await {
|
||||||
|
messages.push(message);
|
||||||
|
}
|
||||||
|
messages
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tokio::test]
|
||||||
|
async fn tap_copies_every_routed_message_once() {
|
||||||
|
let world = create_world("tap");
|
||||||
|
let wasm = toolbox_wasm().clone();
|
||||||
|
let (host, mut mailbox) = start(&world).await;
|
||||||
|
let source = passing_source(&world, "source");
|
||||||
|
spawn_type(&host, &mut mailbox, "tapped", &wasm, &source).await;
|
||||||
|
let subscribe = json!({"type": "subscribe", "actor": "tapped"});
|
||||||
|
assert_eq!(request(&host, &mut mailbox, subscribe).await.body["type"], "subscribed");
|
||||||
|
assert_eq!(request(&host, &mut mailbox, json!({"type": "tap"})).await.body["type"], "tapping");
|
||||||
|
|
||||||
|
let echo = json!({"type": "echo", "value": "hi"});
|
||||||
|
let echo_id = host.broker.send("console", Some("tapped"), None, None, echo.clone());
|
||||||
|
let publish = json!({"type": "publish", "value": "news"});
|
||||||
|
host.broker.send("console", Some("tapped"), None, None, publish);
|
||||||
|
let messages = drain(&mut mailbox, Duration::from_secs(2)).await;
|
||||||
|
let copies: Vec<&Value> = messages
|
||||||
|
.iter()
|
||||||
|
.filter(|m| m.from == "broker" && m.body["type"] == "tapped")
|
||||||
|
.map(|m| &m.body)
|
||||||
|
.collect();
|
||||||
|
// 4 copies (2 requests, 1 reply, 1 publish) + the reply + the publish itself.
|
||||||
|
assert_eq!((copies.len(), messages.len()), (4, 6), "{messages:?}");
|
||||||
|
for copy in &copies {
|
||||||
|
assert!(copy["ts"].as_u64().unwrap() > 0, "{copy}");
|
||||||
|
}
|
||||||
|
let count = |want: Value| copies.iter().filter(|c| c["message"] == want).count();
|
||||||
|
let request_copy = json!({"id": echo_id, "from": "console", "to": "tapped", "reply_to": null, "body": echo});
|
||||||
|
assert_eq!(count(request_copy), 1, "{copies:?}");
|
||||||
|
let reply_copies = copies
|
||||||
|
.iter()
|
||||||
|
.filter(|c| c["message"]["reply_to"] == echo_id.as_str() && c["message"]["from"] == "tapped" && c["message"]["to"] == "console")
|
||||||
|
.count();
|
||||||
|
assert_eq!(reply_copies, 1, "{copies:?}");
|
||||||
|
let publish_copy = copies.iter().find(|c| c["message"]["body"]["type"] == "published").expect("publish not tapped");
|
||||||
|
assert_eq!(publish_copy["message"]["from"], "tapped");
|
||||||
|
assert_eq!(publish_copy["message"]["to"], Value::Null);
|
||||||
|
|
||||||
|
assert_eq!(request(&host, &mut mailbox, json!({"type": "untap"})).await.body["type"], "untapped");
|
||||||
|
let echo_id = host.broker.send("console", Some("tapped"), None, None, json!({"type": "echo", "value": "quiet"}));
|
||||||
|
let messages = drain(&mut mailbox, Duration::from_secs(1)).await;
|
||||||
|
assert_eq!(messages.len(), 1, "{messages:?}");
|
||||||
|
assert_eq!(messages[0].reply_to.as_deref(), Some(echo_id.as_str()));
|
||||||
|
host.stop().await;
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tokio::test]
|
||||||
|
async fn tap_survives_a_restart() {
|
||||||
|
let world = create_world("tap-restart");
|
||||||
|
let (host, mut mailbox) = start(&world).await;
|
||||||
|
assert_eq!(request(&host, &mut mailbox, json!({"type": "tap"})).await.body["type"], "tapping");
|
||||||
|
host.stop().await;
|
||||||
|
assert!(world.read_meta("console").tapped);
|
||||||
|
|
||||||
|
let (host, mut mailbox) = start(&world).await;
|
||||||
|
let id = host.broker.send("console", Some("nobody"), None, None, json!({"type": "hello"}));
|
||||||
|
let copy = tokio::time::timeout(Duration::from_secs(10), async {
|
||||||
|
loop {
|
||||||
|
let m = mailbox.recv().await.expect("console mailbox closed");
|
||||||
|
if m.body["type"] == "tapped" && m.body["message"]["id"] == id.as_str() {
|
||||||
|
return m;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
.expect("no tapped copy after the restart");
|
||||||
|
assert_eq!(copy.body["message"]["to"], "nobody");
|
||||||
|
host.stop().await;
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tokio::test]
|
||||||
|
async fn a_full_tapper_mailbox_drops_copies_without_blocking() {
|
||||||
|
let world = create_world("tap-full");
|
||||||
|
let (host, mut mailbox) = start(&world).await;
|
||||||
|
// "ghost" taps and never reads its mailbox.
|
||||||
|
let mut ghost = host.mailbox("ghost");
|
||||||
|
let mut sink = host.mailbox("sink");
|
||||||
|
host.broker.send("ghost", Some("broker"), None, None, json!({"type": "tap"}));
|
||||||
|
tokio::time::timeout(Duration::from_secs(10), async {
|
||||||
|
while !world.read_meta("ghost").tapped {
|
||||||
|
tokio::time::sleep(Duration::from_millis(10)).await;
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
.expect("tap was not saved");
|
||||||
|
|
||||||
|
let total = sausage::broker::MAILBOX_SIZE + 500;
|
||||||
|
for n in 0..total {
|
||||||
|
host.broker.send("console", Some("sink"), None, None, json!({"type": "n", "n": n}));
|
||||||
|
assert_eq!(sink.try_recv().unwrap().body["n"], n);
|
||||||
|
}
|
||||||
|
assert!(mailbox.try_recv().is_err(), "a dropped copy reported something to the sender");
|
||||||
|
let mut held = 0;
|
||||||
|
while ghost.try_recv().is_ok() {
|
||||||
|
held += 1;
|
||||||
|
}
|
||||||
|
assert_eq!(held, sausage::broker::MAILBOX_SIZE);
|
||||||
|
host.broker.send("console", Some("sink"), None, None, json!({"type": "after"}));
|
||||||
|
assert_eq!(ghost.try_recv().unwrap().body["type"], "tapped");
|
||||||
|
host.stop().await;
|
||||||
|
}
|
||||||
|
|||||||
@@ -36,18 +36,19 @@
|
|||||||
meta.mainProgram = "sausage";
|
meta.mainProgram = "sausage";
|
||||||
};
|
};
|
||||||
# `nix run .#loop -- <world>` runs the newest `sausage run <world>`
|
# `nix run .#loop -- <world>` runs the newest `sausage run <world>`
|
||||||
# from the Gitea repo, again and again: after a crash or a broker
|
# (without a folder: bare `sausage`, i.e. ./world, created if needed)
|
||||||
|
# from the public repo, again and again: after a crash or a broker
|
||||||
# `exit` request it refreshes the flake and starts the host again,
|
# `exit` request it refreshes the flake and starts the host again,
|
||||||
# so the world updates itself. `/quit` (exit code 0) ends the loop.
|
# so the world updates itself. `/quit` (exit code 0) ends the loop.
|
||||||
# `--internal` (or `.#loop-internal`) uses Gitea's SSH port on the LAN.
|
# SAUSAGE_FLAKE overrides where it fetches from (any flake URL,
|
||||||
publicUrl = "git+ssh://containeruser@gitea.surma.technology:2222/surma/sausage";
|
# e.g. a fork or a local checkout).
|
||||||
internalUrl = "git+ssh://containeruser@10.0.0.2:2222/surma/sausage";
|
repoUrl = "git+https://gitea.surma.technology/surma/sausage";
|
||||||
loop = name: url: pkgs.writeShellScriptBin name ''
|
loop = pkgs.writeShellScriptBin "sausage-loop" ''
|
||||||
url="${url}"
|
url="''${SAUSAGE_FLAKE:-${repoUrl}}"
|
||||||
if [ "''${1:-}" = "--internal" ]; then url="${internalUrl}"; shift; fi
|
# No folder: bare `sausage` (creates ./world first if needed).
|
||||||
if [ $# -eq 0 ]; then set -- world; fi
|
if [ $# -gt 0 ]; then set -- run "$@"; fi
|
||||||
while true; do
|
while true; do
|
||||||
nix run --refresh "$url#default" -- run "$@"
|
nix run --refresh "$url#default" -- "$@"
|
||||||
code=$?
|
code=$?
|
||||||
if [ "$code" -eq 0 ]; then exit 0; fi
|
if [ "$code" -eq 0 ]; then exit 0; fi
|
||||||
echo "sausage-loop: sausage exited with $code, starting the newest version in 2 s …" >&2
|
echo "sausage-loop: sausage exited with $code, starting the newest version in 2 s …" >&2
|
||||||
@@ -72,8 +73,7 @@
|
|||||||
});
|
});
|
||||||
|
|
||||||
apps.default = { type = "app"; program = "${sausage}/bin/sausage"; };
|
apps.default = { type = "app"; program = "${sausage}/bin/sausage"; };
|
||||||
apps.loop = { type = "app"; program = "${loop "sausage-loop" publicUrl}/bin/sausage-loop"; };
|
apps.loop = { type = "app"; program = "${loop}/bin/sausage-loop"; };
|
||||||
apps.loop-internal = { type = "app"; program = "${loop "sausage-loop-internal" internalUrl}/bin/sausage-loop-internal"; };
|
|
||||||
|
|
||||||
devShells.default = pkgs.mkShell {
|
devShells.default = pkgs.mkShell {
|
||||||
packages = [ rust pkgs.wasmtime pkgs.wasm-tools ];
|
packages = [ rust pkgs.wasmtime pkgs.wasm-tools ];
|
||||||
|
|||||||
Reference in New Issue
Block a user