Skip to content

Commit

Permalink
fix: update default hub origin to have /ui/ path (#1464)
Browse files Browse the repository at this point in the history
Fixes RVT-4121
Fixes RVT-4204
  • Loading branch information
NathanFlurry committed Nov 25, 2024
1 parent 76dad38 commit 0e53a0e
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 10 deletions.
5 changes: 2 additions & 3 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@

!Cargo.lock
!Cargo.toml
!sdks/full/rust/Cargo.toml
!sdks/full/rust/src
!sdks/api/full/rust/Cargo.toml
!sdks/api/full/rust/src
!packages
!resources/legacy/proto

sdks/runtime
svc/**/*.md

3 changes: 1 addition & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions docker/monolith/Dockerfile.dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,3 @@ docker/monolith/Dockerfile
docker/monolith/Dockerfile.dockerignore
docker/monolith/*.md

sdks/runtime

4 changes: 3 additions & 1 deletion packages/api/ui/src/route.rs
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,9 @@ impl Router {
Ok(Some(content))
}
None => {
if path.ends_with(".html") || !path.contains('.') {
// HACK(FRONT-545): Paths with tokens in them are interpreted as a file, so we
// include certain exceptions
if path.ends_with(".html") || !path.contains('.') || path.contains("device.") {
tracing::debug!(
path = ?path,
"file not found, serving index.html"
Expand Down
2 changes: 1 addition & 1 deletion packages/common/config/src/config/server/rivet/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -561,7 +561,7 @@ impl Ui {

pub fn public_origin(&self) -> Url {
self.public_origin.clone().unwrap_or_else(|| {
Url::parse(&format!("http://127.0.0.1:{}", default_ports::API_PUBLIC)).unwrap()
Url::parse(&format!("http://127.0.0.1:{}/ui", default_ports::API_PUBLIC)).unwrap()
})
}

Expand Down
2 changes: 1 addition & 1 deletion packages/common/hub-embed/build.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use std::{env, fs, path::Path};

const HUB_URL: &str = "https://releases.rivet.gg/hub/2024-11-13-06-23-39-b01b441-embed.zip";
const HUB_URL: &str = "https://releases.rivet.gg/hub/2024-11-25-00-13-42-34b1869-embed.zip";
const OUT_DIR: &str = "hub_files";

fn main() -> Result<(), Box<dyn std::error::Error>> {
Expand Down

0 comments on commit 0e53a0e

Please sign in to comment.