Skip to content
This repository was archived by the owner on Jul 7, 2025. It is now read-only.

feat: fix compat with Rust, enable Ping + Identify #85

Merged
bajtos merged 9 commits into from
Mar 6, 2023
Merged

feat: fix compat with Rust, enable Ping + Identify #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b80d828
refactor: simplify node behavior impl
bajtos Mar 2, 2023
7aa93fa
fix compatibility with Rust ping impl
bajtos Mar 2, 2023
ee4ba7e
make ping configurable
bajtos Mar 2, 2023
7cd2854
refactor - code cleanup in peer.rs
bajtos Mar 2, 2023
e5f0dd6
fixup! enable `ping` in production builds
bajtos Mar 2, 2023
2117e65
feat: handle `Identify` requests
bajtos Mar 2, 2023
1de9ffb
Merge branch 'main' into fix-rust-ping-compat
bajtos Mar 2, 2023
9994851
fixup! clippy
bajtos Mar 2, 2023
21d5d45
Merge branch 'main' into fix-rust-ping-compat
bajtos Mar 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 33 additions & 0 deletions Cargo.lock
View file
Open in desktop

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

8 changes: 6 additions & 2 deletions cli/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ mod args;
use args::{CliArgs, Commands};
use clap::Parser;

use zinnia_runtime::colors;
use zinnia_runtime::deno_core;
use zinnia_runtime::fmt_errors::format_js_error;
use zinnia_runtime::{colors, BootstrapOptions};
use zinnia_runtime::{run_js_module, AnyError};

use deno_core::error::JsError;
Expand All @@ -28,7 +28,11 @@ async fn main_impl() -> Result<(), AnyError> {
match cli_args.command {
Commands::Run { file } => {
let main_module = deno_core::resolve_path(&file)?;
run_js_module(&main_module, &Default::default()).await?;
let config = BootstrapOptions {
agent_version: format!("zinnia/{}", env!("CARGO_PKG_VERSION")),
..Default::default()
};
run_js_module(&main_module, &config).await?;
Ok(())
}
}
Expand Down
45 changes: 3 additions & 42 deletions ext/libp2p/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@ features = [
# "ecdsa",
# "floodsub",
# "gossipsub",
# "identify",
"identify",
# "kad",
# "mdns",
# "metrics",
"mplex",
"noise",
# "ping",
"ping",
# "plaintext",
# "pnet",
# "quic",
Expand All @@ -61,45 +61,6 @@ features = [

[dev-dependencies]
env_logger.workspace = true

[dev-dependencies.libp2p]
version = "0.50.1"
features = [
# "async-std",
# "autonat",
# "dcutr",
# "deflate",
# "dns",
# "ecdsa",
# "floodsub",
# "gossipsub",
# "identify",
# "kad",
# "mdns",
# "metrics",
# "mplex",
# "noise",
"ping",
# "plaintext",
# "pnet",
# "quic",
# "macros",
# "relay",
# "rendezvous",
# "request-response",
# "rsa",
# "secp256k1",
# "serde",
# "tcp",
# "tls",
# "tokio",
# "uds",
# "wasm-bindgen",
# "wasm-ext",
# "wasm-ext-websocket",
# "webrtc",
# "websocket",
# "yamux",
]
rand = "0.8.5"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
6 changes: 4 additions & 2 deletions ext/libp2p/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,16 @@ use deno_core::error::AnyError;
use deno_core::{include_js_files, op, Extension, OpState, ZeroCopyBuf};
use libp2p::multiaddr::Protocol;
use libp2p::{Multiaddr, PeerId};
use peer::{PeerNode, PeerNodeConfig};
use peer::PeerNode;

pub use peer::PeerNodeConfig;

mod peer;

#[derive(Clone, Debug, Default)]
pub struct Options {
/// Configuration options for the built-in (default) peer node
default_peer: PeerNodeConfig,
pub default_peer: PeerNodeConfig,
}

#[derive(Debug, Clone, Copy)]
Expand Down
Loading