Skip to content

Commit 7edb49a

Browse files
committed
feat: add ws msg ack to runner protocol
1 parent 049fe1f commit 7edb49a

File tree

40 files changed

+1776
-422
lines changed

40 files changed

+1776
-422
lines changed

Cargo.lock

Lines changed: 49 additions & 50 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ version = "4.3"
148148
features = ["derive"]
149149

150150
[workspace.dependencies.rivet-term]
151-
git = "https://github.com/rivet-gg/rivet-term"
151+
git = "https://github.com/rivet-dev/rivet-term"
152152
rev = "55e328470b68c557fb9bc8298369f90182d35b6d"
153153

154154
[workspace.dependencies.clickhouse]
@@ -249,7 +249,8 @@ default-features = false
249249
features = ["ansi","fmt","json","env-filter"]
250250

251251
[workspace.dependencies.vbare]
252-
version = "0.0.2"
252+
git = "https://github.com/rivet-dev/vbare"
253+
rev = "3ae474a0234801bb96d70bec4eddd4f2d640971e"
253254

254255
[workspace.dependencies.vbare-compiler]
255256
version = "0.0.2"

engine/artifacts/errors/guard.websocket_pending_limit_reached.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

engine/artifacts/errors/guard.websocket_service_retry.json

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

engine/artifacts/errors/guard.websocket_service_timeout.json

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

engine/artifacts/openapi.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

engine/packages/epoxy/src/http_client.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ pub async fn send_message_to_address(
135135
let client = rivet_pools::reqwest::client().await?;
136136

137137
// Create the request
138-
let request = versioned::Request::latest(request);
138+
let request = versioned::Request::wrap_latest(request);
139139

140140
// Send the request
141141
let response_result = client

engine/packages/epoxy/src/http_routes.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,5 @@ pub async fn message(ctx: ApiCtx, path: VersionedPath, _query: (), body: Bytes)
3030
// Process message directly using ops
3131
let response = crate::replica::message_request::message_request(&ctx, request).await?;
3232

33-
versioned::Response::latest(response).serialize(path.version)
33+
versioned::Response::wrap_latest(response).serialize(path.version)
3434
}

engine/packages/epoxy/src/keys/replica.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ impl FormalKey for LogEntryKey {
5252
}
5353

5454
fn serialize(&self, value: Self::Value) -> Result<Vec<u8>> {
55-
epoxy_protocol::versioned::LogEntry::latest(value)
55+
epoxy_protocol::versioned::LogEntry::wrap_latest(value)
5656
.serialize_with_embedded_version(epoxy_protocol::PROTOCOL_VERSION)
5757
}
5858
}
@@ -162,7 +162,7 @@ impl FormalKey for ConfigKey {
162162
}
163163

164164
fn serialize(&self, value: Self::Value) -> Result<Vec<u8>> {
165-
epoxy_protocol::versioned::ClusterConfig::latest(value)
165+
epoxy_protocol::versioned::ClusterConfig::wrap_latest(value)
166166
.serialize_with_embedded_version(epoxy_protocol::PROTOCOL_VERSION)
167167
}
168168
}
@@ -223,7 +223,7 @@ impl FormalKey for CurrentBallotKey {
223223
}
224224

225225
fn serialize(&self, value: Self::Value) -> Result<Vec<u8>> {
226-
epoxy_protocol::versioned::Ballot::latest(value)
226+
epoxy_protocol::versioned::Ballot::wrap_latest(value)
227227
.serialize_with_embedded_version(epoxy_protocol::PROTOCOL_VERSION)
228228
}
229229
}
@@ -262,7 +262,7 @@ impl FormalKey for InstanceBallotKey {
262262
}
263263

264264
fn serialize(&self, value: Self::Value) -> Result<Vec<u8>> {
265-
epoxy_protocol::versioned::Ballot::latest(value)
265+
epoxy_protocol::versioned::Ballot::wrap_latest(value)
266266
.serialize_with_embedded_version(epoxy_protocol::PROTOCOL_VERSION)
267267
}
268268
}

engine/packages/guard-core/src/errors.rs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,14 @@ pub struct ServiceUnavailable;
8181
)]
8282
pub struct WebSocketServiceUnavailable;
8383

84+
#[derive(RivetError, Serialize, Deserialize)]
85+
#[error("guard", "websocket_service_retry", "WebSocket service retry.")]
86+
pub struct WebSocketServiceRetry;
87+
88+
#[derive(RivetError, Serialize, Deserialize)]
89+
#[error("guard", "websocket_service_timeout", "WebSocket service timed out.")]
90+
pub struct WebSocketServiceTimeout;
91+
8492
#[derive(RivetError, Serialize, Deserialize)]
8593
#[error(
8694
"guard",

0 commit comments

Comments
 (0)