From 99d1be713abce7f6822c5353b01f1cc867134273 Mon Sep 17 00:00:00 2001 From: JunichiSugiura Date: Mon, 19 Feb 2024 18:38:22 +0100 Subject: [PATCH 1/4] Show world explore url --- bin/torii/src/main.rs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/bin/torii/src/main.rs b/bin/torii/src/main.rs index ccf0842cc0..ec76fbc8d5 100644 --- a/bin/torii/src/main.rs +++ b/bin/torii/src/main.rs @@ -14,6 +14,8 @@ use std::net::SocketAddr; use std::str::FromStr; use std::sync::Arc; +use base64::engine::general_purpose; +use base64::Engine as _; use clap::Parser; use common::parse::{parse_socket_address, parse_url}; use dojo_world::contracts::world::WorldContractReader; @@ -196,8 +198,11 @@ async fn main() -> anyhow::Result<()> { ) .expect("Failed to start libp2p relay server"); - info!(target: "torii::cli", "Starting torii endpoint: {}", format!("http://{}", args.addr)); - info!(target: "torii::cli", "Serving Graphql playground: {}\n", format!("http://{}/graphql", args.addr)); + let endpoint = format!("http://{}", args.addr); + let encoded = general_purpose::STANDARD.encode(&endpoint).to_string(); + info!(target: "torii::cli", "Starting torii endpoint: {}", endpoint); + info!(target: "torii::cli", "Serving Graphql playground: {}", format!("http://{}/graphql", args.addr)); + info!(target: "torii::cli", "World explorer is available on: {}\n", format!("https://worlds.dev/torii/{}", encoded)); if let Some(listen_addr) = args.metrics { let prometheus_handle = prometheus_exporter::install_recorder("torii")?; From 8549cb2a6d888f694f2948a637a67b3eedc4b53c Mon Sep 17 00:00:00 2001 From: JunichiSugiura Date: Tue, 20 Feb 2024 13:04:50 +0100 Subject: [PATCH 2/4] Url encode torii endpoint --- bin/torii/src/main.rs | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/bin/torii/src/main.rs b/bin/torii/src/main.rs index ec76fbc8d5..ec5f6f5e64 100644 --- a/bin/torii/src/main.rs +++ b/bin/torii/src/main.rs @@ -14,8 +14,6 @@ use std::net::SocketAddr; use std::str::FromStr; use std::sync::Arc; -use base64::engine::general_purpose; -use base64::Engine as _; use clap::Parser; use common::parse::{parse_socket_address, parse_url}; use dojo_world::contracts::world::WorldContractReader; @@ -40,7 +38,7 @@ use torii_core::types::Model; use torii_server::proxy::Proxy; use tracing::info; use tracing_subscriber::{fmt, EnvFilter}; -use url::Url; +use url::{form_urlencoded, Url}; /// Dojo World Indexer #[derive(Parser, Debug)] @@ -199,10 +197,11 @@ async fn main() -> anyhow::Result<()> { .expect("Failed to start libp2p relay server"); let endpoint = format!("http://{}", args.addr); - let encoded = general_purpose::STANDARD.encode(&endpoint).to_string(); + let graphql = format!("{}/graphql", endpoint); + let encoded: String = form_urlencoded::byte_serialize(graphql.as_bytes()).collect(); info!(target: "torii::cli", "Starting torii endpoint: {}", endpoint); - info!(target: "torii::cli", "Serving Graphql playground: {}", format!("http://{}/graphql", args.addr)); - info!(target: "torii::cli", "World explorer is available on: {}\n", format!("https://worlds.dev/torii/{}", encoded)); + info!(target: "torii::cli", "Serving Graphql playground: {}", graphql); + info!(target: "torii::cli", "World explorer is available on: {}\n", format!("https://worlds.dev/torii?url={}", encoded)); if let Some(listen_addr) = args.metrics { let prometheus_handle = prometheus_exporter::install_recorder("torii")?; From c0cd511e4844ae68d0930645f7bf5de15f830385 Mon Sep 17 00:00:00 2001 From: JunichiSugiura Date: Tue, 20 Feb 2024 20:07:23 +0100 Subject: [PATCH 3/4] Replace 0.0.0.0 with localhost --- bin/torii/src/main.rs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/bin/torii/src/main.rs b/bin/torii/src/main.rs index ec5f6f5e64..d2c1fe6485 100644 --- a/bin/torii/src/main.rs +++ b/bin/torii/src/main.rs @@ -197,10 +197,12 @@ async fn main() -> anyhow::Result<()> { .expect("Failed to start libp2p relay server"); let endpoint = format!("http://{}", args.addr); - let graphql = format!("{}/graphql", endpoint); - let encoded: String = form_urlencoded::byte_serialize(graphql.as_bytes()).collect(); + let gql_endpoint = format!("{}/graphql", endpoint); + let encoded: String = + form_urlencoded::byte_serialize(gql_endpoint.replace("0.0.0.0", "localhost").as_bytes()) + .collect(); info!(target: "torii::cli", "Starting torii endpoint: {}", endpoint); - info!(target: "torii::cli", "Serving Graphql playground: {}", graphql); + info!(target: "torii::cli", "Serving Graphql playground: {}", gql_endpoint); info!(target: "torii::cli", "World explorer is available on: {}\n", format!("https://worlds.dev/torii?url={}", encoded)); if let Some(listen_addr) = args.metrics { From 75bb654410030e4a1dd97e9d377e2a1143114352 Mon Sep 17 00:00:00 2001 From: JunichiSugiura Date: Thu, 22 Feb 2024 08:19:00 +0100 Subject: [PATCH 4/4] Capitalize "World Explorer" --- bin/torii/src/main.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/torii/src/main.rs b/bin/torii/src/main.rs index d2c1fe6485..e5cbe2ac2d 100644 --- a/bin/torii/src/main.rs +++ b/bin/torii/src/main.rs @@ -203,7 +203,7 @@ async fn main() -> anyhow::Result<()> { .collect(); info!(target: "torii::cli", "Starting torii endpoint: {}", endpoint); info!(target: "torii::cli", "Serving Graphql playground: {}", gql_endpoint); - info!(target: "torii::cli", "World explorer is available on: {}\n", format!("https://worlds.dev/torii?url={}", encoded)); + info!(target: "torii::cli", "World Explorer is available on: {}\n", format!("https://worlds.dev/torii?url={}", encoded)); if let Some(listen_addr) = args.metrics { let prometheus_handle = prometheus_exporter::install_recorder("torii")?;