Skip to content

Commit c95b546

Browse files
NathanFlurryNathanFlurry
committed
chore: merge tunnel in to runner
1 parent 6d91924 commit c95b546

File tree

55 files changed

+2004
-5385
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+2004
-5385
lines changed

‎.github/workflows/pkg-pr-new.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ jobs:
1616
with:
1717
cache: "pnpm"
1818
- run: pnpm install
19-
- run: pnpm build -F @rivetkit/engine-runner-protocol -F @rivetkit/engine-tunnel-protocol -F @rivetkit/engine-runner
20-
- run: pnpm dlx pkg-pr-new publish 'sdks/typescript/runner/' 'sdks/typescript/runner-protocol/' 'sdks/typescript/tunnel-protocol/'
19+
- run: pnpm build -F @rivetkit/engine-runner-protocol -F @rivetkit/engine-runner
20+
- run: pnpm dlx pkg-pr-new publish 'sdks/typescript/runner/' 'sdks/typescript/runner-protocol/'

‎Cargo.lock‎

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

‎Cargo.toml‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
[workspace]
33
resolver = "2"
4-
members = ["packages/common/api-builder","packages/common/api-types","packages/common/api-util","packages/common/cache/build","packages/common/cache/result","packages/common/clickhouse-inserter","packages/common/clickhouse-user-query","packages/common/config","packages/common/env","packages/common/error/core","packages/common/error/macros","packages/common/gasoline/core","packages/common/gasoline/macros","packages/common/logs","packages/common/metrics","packages/common/pools","packages/common/runtime","packages/common/service-manager","packages/common/telemetry","packages/common/test-deps","packages/common/test-deps-docker","packages/common/types","packages/common/universaldb","packages/common/universalpubsub","packages/common/util/core","packages/common/util/id","packages/common/versioned-data-util","packages/core/actor-kv","packages/core/api-peer","packages/core/api-public","packages/core/bootstrap","packages/core/dump-openapi","packages/core/guard/core","packages/core/guard/server","packages/core/pegboard-gateway","packages/core/pegboard-runner","packages/core/pegboard-serverless","packages/core/pegboard-tunnel","packages/core/workflow-worker","packages/infra/engine","packages/services/epoxy","packages/services/internal","packages/services/namespace","packages/services/pegboard","sdks/rust/api-full","sdks/rust/bare_gen","sdks/rust/data","sdks/rust/epoxy-protocol","sdks/rust/runner-protocol","sdks/rust/tunnel-protocol","sdks/rust/ups-protocol"]
4+
members = ["packages/common/api-builder","packages/common/api-types","packages/common/api-util","packages/common/cache/build","packages/common/cache/result","packages/common/clickhouse-inserter","packages/common/clickhouse-user-query","packages/common/config","packages/common/env","packages/common/error/core","packages/common/error/macros","packages/common/gasoline/core","packages/common/gasoline/macros","packages/common/logs","packages/common/metrics","packages/common/pools","packages/common/runtime","packages/common/service-manager","packages/common/telemetry","packages/common/test-deps","packages/common/test-deps-docker","packages/common/types","packages/common/universaldb","packages/common/universalpubsub","packages/common/util/core","packages/common/util/id","packages/common/versioned-data-util","packages/core/actor-kv","packages/core/api-peer","packages/core/api-public","packages/core/bootstrap","packages/core/dump-openapi","packages/core/guard/core","packages/core/guard/server","packages/core/pegboard-gateway","packages/core/pegboard-runner","packages/core/pegboard-serverless","packages/core/workflow-worker","packages/infra/engine","packages/services/epoxy","packages/services/internal","packages/services/namespace","packages/services/pegboard","sdks/rust/api-full","sdks/rust/bare_gen","sdks/rust/data","sdks/rust/epoxy-protocol","sdks/rust/runner-protocol","sdks/rust/ups-protocol"]
55

66
[workspace.package]
77
version = "25.7.1"
@@ -365,9 +365,6 @@ path = "packages/core/pegboard-runner"
365365
[workspace.dependencies.pegboard-serverless]
366366
path = "packages/core/pegboard-serverless"
367367

368-
[workspace.dependencies.pegboard-tunnel]
369-
path = "packages/core/pegboard-tunnel"
370-
371368
[workspace.dependencies.rivet-workflow-worker]
372369
path = "packages/core/workflow-worker"
373370

@@ -401,9 +398,6 @@ path = "sdks/rust/epoxy-protocol"
401398
[workspace.dependencies.rivet-runner-protocol]
402399
path = "sdks/rust/runner-protocol"
403400

404-
[workspace.dependencies.rivet-tunnel-protocol]
405-
path = "sdks/rust/tunnel-protocol"
406-
407401
[workspace.dependencies.rivet-ups-protocol]
408402
path = "sdks/rust/ups-protocol"
409403

‎frontend/package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
"dev:inspector": "vite --config vite.inspector.config.ts",
99
"dev:engine": "vite --config vite.engine.config.ts",
1010
"ts-check": "tsc --noEmit",
11+
"build": "echo 'Please use build:engine or build:inspector' && exit 1",
1112
"build:inspector": "vite build --mode=production --config vite.inspector.config.ts",
1213
"build:engine": "vite build --mode=production --config vite.engine.config.ts",
1314
"preview:inspector": "vite preview --config vite.inspector.config.ts",

‎packages/core/guard/server/Cargo.toml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ hyper = "1.6.0"
2424
indoc.workspace = true
2525
once_cell.workspace = true
2626
pegboard-gateway.workspace = true
27-
pegboard-tunnel.workspace = true
2827
pegboard.workspace = true
2928
pegboard-runner.workspace = true
3029
regex.workspace = true

‎packages/core/guard/server/src/routing/mod.rs‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ use crate::{errors, shared_state::SharedState};
99

1010
mod api_public;
1111
pub mod pegboard_gateway;
12-
mod pegboard_tunnel;
1312
mod runner;
1413

1514
pub(crate) const X_RIVET_TARGET: HeaderName = HeaderName::from_static("x-rivet-target");
@@ -54,12 +53,6 @@ pub fn create_routing_function(ctx: StandaloneCtx, shared_state: SharedState) ->
5453
return Ok(routing_output);
5554
}
5655

57-
if let Some(routing_output) =
58-
pegboard_tunnel::route_request(&ctx, target, host, path).await?
59-
{
60-
return Ok(routing_output);
61-
}
62-
6356
if let Some(routing_output) =
6457
api_public::route_request(&ctx, target, host, path).await?
6558
{

‎packages/core/guard/server/src/routing/pegboard_gateway.rs‎

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -173,38 +173,11 @@ async fn find_actor(
173173

174174
tracing::debug!(?actor_id, ?runner_id, "actor ready");
175175

176-
// TODO: Remove round trip, return key from get_runner op above
177-
// Get runner key, namespace_id, and runner_name from runner_id
178-
let (runner_key, namespace_id, runner_name) = ctx
179-
.udb()?
180-
.run(|tx| async move {
181-
let tx = tx.with_subspace(pegboard::keys::subspace());
182-
183-
let runner_key_key = pegboard::keys::runner::KeyKey::new(runner_id);
184-
let namespace_id_key = pegboard::keys::runner::NamespaceIdKey::new(runner_id);
185-
let runner_name_key = pegboard::keys::runner::NameKey::new(runner_id);
186-
187-
let (runner_key, namespace_id, runner_name) = tokio::try_join!(
188-
tx.read_opt(&runner_key_key, Serializable),
189-
tx.read_opt(&namespace_id_key, Serializable),
190-
tx.read_opt(&runner_name_key, Serializable),
191-
)?;
192-
193-
let runner_key = runner_key.context("runner key not found")?;
194-
let namespace_id = namespace_id.context("runner namespace_id not found")?;
195-
let runner_name = runner_name.context("runner name not found")?;
196-
197-
Ok((runner_key, namespace_id, runner_name))
198-
})
199-
.await?;
200-
201176
// Return pegboard-gateway instance
202177
let gateway = pegboard_gateway::PegboardGateway::new(
203178
ctx.clone(),
204179
shared_state.pegboard_gateway.clone(),
205-
namespace_id,
206-
runner_name,
207-
runner_key,
180+
runner_id,
208181
actor_id,
209182
);
210183
Ok(Some(RoutingOutput::CustomServe(std::sync::Arc::new(

‎packages/core/guard/server/src/routing/pegboard_tunnel.rs‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎packages/core/pegboard-gateway/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ http-body-util.workspace = true
1515
hyper = "1.6"
1616
hyper-tungstenite.workspace = true
1717
pegboard.workspace = true
18+
rivet-runner-protocol.workspace = true
1819
rand.workspace = true
1920
rivet-error.workspace = true
2021
rivet-guard-core.workspace = true
21-
rivet-tunnel-protocol.workspace = true
2222
rivet-util.workspace = true
2323
thiserror.workspace = true
2424
tokio-tungstenite.workspace = true

0 commit comments

Comments
 (0)