Make use of the new `serve_web_viewer` function #9547

emilk · 2025-04-08T16:07:43Z

What

This makes use of the new serve_web_viewer function, and refers to it from docs.

github-actions · 2025-04-08T16:08:14Z

Web viewer built successfully. If applicable, you should also test it:

I have tested the web viewer

Result	Commit	Link	Manifest
✅	`d3ba935`	https://rerun.io/viewer/pr/9547	`+nightly` `+main`

^{Note: This comment is updated whenever you push a commit.}

github-actions · 2025-04-08T16:08:18Z

Latest documentation preview deployed successfully.

Result	Commit	Link
✅	`d3ba935`	https://landing-rezcpk9rt-rerun.vercel.app/docs

^{Note: This comment is updated whenever you push a commit.}

emilk · 2025-04-08T16:13:03Z

@rerun-bot full-check

github-actions · 2025-04-08T16:13:37Z

Started a full build: https://github.com/rerun-io/rerun/actions/runs/14338462242

emilk · 2025-04-08T16:40:37Z

@rerun-bot full-check

github-actions · 2025-04-08T16:41:10Z

Started a full build: https://github.com/rerun-io/rerun/actions/runs/14338984207

zalo · 2025-04-09T18:12:11Z

How difficult would it be for this new architecture to handle multiple servers serving to the same viewer?

emilk · 2025-04-10T06:40:05Z

The viewer on main can connect to multiple servers already!

grtlr

Nice!

grtlr · 2025-04-10T07:50:11Z

crates/utils/re_uri/src/origin.rs

+        let mut has_port = true;
+        {
+            // Parsing with a non-standard scheme
+            // is a hack to work around the `url` crate bug
+            // <https://github.com/servo/rust-url/issues/957>.
+            if let Some(rest) = http_url.to_string().strip_prefix("http://") {
+                has_port = url::Url::parse(&format!("foobarbaz://{rest}"))?
+                    .port()
+                    .is_some();
+            } else if let Some(rest) = http_url.to_string().strip_prefix("https://") {
+                has_port = url::Url::parse(&format!("foobarbaz://{rest}"))?
+                    .port()
+                    .is_some();
+            } else {
+                // Should not happen.
+            };
+        }
+
+        if !has_port {
+            // If no port is specified, we assume the default:
+            http_url.set_port(Some(crate::DEFAULT_PROXY_PORT)).ok();


I might be missing something here, but maybe we should set the port based on the actual route? I.e. using 9876 for /proxy and 51234 for /recording and /catalog?

yes, that would be nice, but since Origin doesn't know about that it would require more structural changes (e.g. have Origin parse port to None). I guess I could do an ugly search for /proxy here though 🙈

It would be easier to just switch redap to use the same port as OSS

It doesn't make sense for Origin to even be able to produce a default port. Only RedapUri has sufficient context for that.

It would be easier to just switch redap to use the same port as OSS

It can't be on the same port until it's the same service

It can't be on the same port until it's the same service

They can be the same, as long as we don't run both at the same time on the same machine

as long as we don't run both at the same time on the same machine

Just to clarify, that always happens by default right now. The following:

/dataplatform $ pixi run redap-server /rerun $ pixi run rerun rerun+http://localhost:51234

will start both a proxy server, and a catalog server. The Viewer starts the proxy server unless it's run with --connect.

So people working on dataplatform are pretty much always running both at the same time on the same machine.

abey79

It's probably because I lack the context, but I'm confused as to why this serve_web PR changes defaults related to connecting to a remote server.

crates/utils/re_uri/src/redap_uri.rs

docs/content/reference/sdk/operating-modes.md

emilk · 2025-04-10T09:15:45Z

Changes:

For localhost, guess default port based on endpoint (/proxy or not)
For non-localhost, use 80 or 443 as default port (depending on scheme)

abey79

lgtm, thanks!

emilk added 11 commits April 8, 2025 17:55

Assume http+rerun:// when connecting to localhost

420efa6

Default to port 51234 if omittied

a6489ec

Improve testing

7e4978c

Use correct default port

6521b93

Update "Operating mode" docs to point to new serve_web_viewer

c398403

Replace serve_web with serve_web_viewer in Python docs

b9bd398

Bug fix: don't host gRPC server on port zero

5e2b6c3

Use new function in serve_web_viewer Rust example

bcce64a

Better naming of a variable

e91c80d

Less use of old serve_web

0fd0988

Link users to the new function from the old one

dca68c2

emilk added 📖 documentation Improvements or additions to documentation exclude from changelog PRs with this won't show up in CHANGELOG.md 🪵 Log & send APIs Affects the user-facing API for all languages labels Apr 8, 2025

emilk changed the title ~~Assume http+rerun:// when connecting to localhost~~ Make use of the new serve_web_viewer function Apr 8, 2025

Fix doclink

10eeedb

grtlr approved these changes Apr 10, 2025

View reviewed changes

abey79 reviewed Apr 10, 2025

View reviewed changes

crates/utils/re_uri/src/redap_uri.rs Outdated Show resolved Hide resolved

crates/utils/re_uri/src/redap_uri.rs Outdated Show resolved Hide resolved

crates/utils/re_uri/src/redap_uri.rs Show resolved Hide resolved

emilk added 2 commits April 10, 2025 10:06

Clarify that there are multiple default ports

3805e68

Use old port in tests

bb07517

emilk force-pushed the emilk/use-serve-web-viewer branch from 9d91a57 to bb07517 Compare April 10, 2025 08:19

Revert other file

34bf35a

emilk commented Apr 10, 2025

View reviewed changes

docs/content/reference/sdk/operating-modes.md Outdated Show resolved Hide resolved

emilk added 5 commits April 10, 2025 10:23

Revert more port changes

e1e19a8

Merge branch 'main' into emilk/use-serve-web-viewer

96d786f

Smarted default port

9ed8659

Only use the default port for localhost

9f79a25

rerun --connect works

d3ba935

abey79 approved these changes Apr 10, 2025

View reviewed changes

emilk merged commit 9d4a590 into main Apr 10, 2025
37 checks passed

emilk deleted the emilk/use-serve-web-viewer branch April 10, 2025 10:03

Make use of the new serve_web_viewer function #9547

Make use of the new serve_web_viewer function #9547

Uh oh!

Conversation

emilk commented Apr 8, 2025

Related

What

Uh oh!

github-actions bot commented Apr 8, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented Apr 8, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

emilk commented Apr 8, 2025

Uh oh!

github-actions bot commented Apr 8, 2025

Uh oh!

emilk commented Apr 8, 2025

Uh oh!

github-actions bot commented Apr 8, 2025

Uh oh!

zalo commented Apr 9, 2025

Uh oh!

emilk commented Apr 10, 2025

Uh oh!

grtlr left a comment

Choose a reason for hiding this comment

Uh oh!

grtlr Apr 10, 2025

Choose a reason for hiding this comment

Uh oh!

grtlr Apr 10, 2025

Choose a reason for hiding this comment

Uh oh!

emilk Apr 10, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

abey79 Apr 10, 2025

Choose a reason for hiding this comment

Uh oh!

jprochazk Apr 10, 2025

Choose a reason for hiding this comment

Uh oh!

emilk Apr 10, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jprochazk Apr 10, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

abey79 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

emilk commented Apr 10, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

abey79 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Make use of the new `serve_web_viewer` function #9547

Make use of the new `serve_web_viewer` function #9547

github-actions bot commented Apr 8, 2025 •

edited

Loading

github-actions bot commented Apr 8, 2025 •

edited

Loading

emilk Apr 10, 2025 •

edited

Loading

emilk Apr 10, 2025 •

edited

Loading

jprochazk Apr 10, 2025 •

edited

Loading

emilk commented Apr 10, 2025 •

edited

Loading