nodes allowed to connect:
@@ -63,7 +76,7 @@
- running processes:
+ running processes
(TODO)
diff --git a/kinode/packages/settings/pkg/ui/script.js b/kinode/packages/settings/pkg/ui/script.js
index 967ff4e0..11aecf9a 100644
--- a/kinode/packages/settings/pkg/ui/script.js
+++ b/kinode/packages/settings/pkg/ui/script.js
@@ -56,17 +56,17 @@ function populate_eth_rpc_providers(providers) {
ul.innerHTML = '';
providers.forEach(provider => {
const li = document.createElement('li');
- li.innerHTML = `
${JSON.stringify(provider)}`;
+ li.innerHTML = `${JSON.stringify(provider, undefined, 2)}`;
ul.appendChild(li);
});
}
function populate_eth_rpc_settings(settings) {
if (settings.public) {
- document.getElementById('public').innerText = 'public';
+ document.getElementById('public').innerText = 'status: public';
document.getElementById('allowed-nodes').style.display = 'none';
} else {
- document.getElementById('public').innerText = 'private';
+ document.getElementById('public').innerText = 'status: private';
const ul = document.getElementById('allowed-nodes');
ul.innerHTML = '';
if (settings.allow.length === 0) {
@@ -119,7 +119,8 @@ document.getElementById('get-peer-pki').addEventListener('submit', (e) => {
if (data === null) {
document.getElementById('peer-pki-response').innerText = "no pki data for peer";
} else {
- document.getElementById('peer-pki-response').innerText = JSON.stringify(data);
+ e.target.reset();
+ document.getElementById('peer-pki-response').innerText = JSON.stringify(data, undefined, 2);
}
});
})
@@ -143,6 +144,7 @@ document.getElementById('ping-peer').addEventListener('submit', (e) => {
}).then(response => response.json())
.then(data => {
if (data === null) {
+ e.target.reset();
document.getElementById('peer-ping-response').innerText = "ping successful!";
} else if (data === "HiTimeout") {
document.getElementById('peer-ping-response').innerText = "node timed out";
@@ -152,6 +154,66 @@ document.getElementById('ping-peer').addEventListener('submit', (e) => {
});
})
+document.getElementById('add-eth-provider').addEventListener('submit', (e) => {
+ e.preventDefault();
+ const data = new FormData(e.target);
+ const rpc_url = data.get('rpc-url');
+ // validate rpc url
+ if (!rpc_url.startsWith('wss://') && !rpc_url.startsWith('ws://')) {
+ alert('Invalid RPC URL');
+ return;
+ }
+ const body = {
+ "EthConfig": {
+ "AddProvider": {
+ chain_id: Number(data.get('chain-id')),
+ trusted: false,
+ provider: { "RpcUrl": rpc_url },
+ }
+ }
+ };
+ fetch(APP_PATH, {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ body: JSON.stringify(body),
+ }).then(response => response.json())
+ .then(data => {
+ if (data === null) {
+ e.target.reset();
+ return;
+ } else {
+ alert(data);
+ }
+ });
+})
+
+document.getElementById('remove-eth-provider').addEventListener('submit', (e) => {
+ e.preventDefault();
+ const data = new FormData(e.target);
+ const body = {
+ "EthConfig": {
+ "RemoveProvider": [Number(data.get('chain-id')), data.get('rpc-url')]
+ }
+ };
+ fetch(APP_PATH, {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ body: JSON.stringify(body),
+ }).then(response => response.json())
+ .then(data => {
+ if (data === null) {
+ e.target.reset();
+ return;
+ } else {
+ alert(data);
+ }
+ });
+})
+
// Setup WebSocket connection
const wsProtocol = location.protocol === 'https:' ? 'wss://' : 'ws://';
const ws = new WebSocket(wsProtocol + location.host + "/settings:settings:sys/");
diff --git a/kinode/packages/settings/pkg/ui/style.css b/kinode/packages/settings/pkg/ui/style.css
index 7121eea3..f9c1d579 100644
--- a/kinode/packages/settings/pkg/ui/style.css
+++ b/kinode/packages/settings/pkg/ui/style.css
@@ -82,14 +82,58 @@ h1 {
}
main {
+ margin: 0 auto;
display: grid;
- grid-template-columns: repeat(auto-fit, minmax(300px, 1fr));
- gap: 20px;
+ grid-template-columns: 1fr 1fr 1fr;
+ gap: 20px 20px;
+ grid-auto-flow: row;
+ grid-template-areas:
+ "diagnostics diagnostics diagnostics"
+ "node-info pings pings"
+ "eth-rpc-providers eth-rpc-providers eth-rpc-settings"
+ "kernel kernel kernel";
padding: 20px;
- max-width: 1200px;
+ max-width: 1100px;
min-width: 300px;
}
+article#net-diagnostics {
+ grid-area: diagnostics;
+}
+
+p#diagnostics,
+p#peer-pki-response,
+p#peer-ping-response {
+ white-space: pre-wrap;
+}
+
+article#node-info {
+ grid-area: node-info;
+}
+
+article#pings {
+ grid-area: pings;
+}
+
+article#eth-rpc-providers {
+ grid-area: eth-rpc-providers;
+}
+
+article#eth-rpc-settings {
+ grid-area: eth-rpc-settings;
+}
+
+article#kernel {
+ grid-area: kernel;
+}
+
+div#provider-edits {
+ display: grid;
+ grid-template-columns: 1fr 1fr;
+ gap: 20px 20px;
+ grid-auto-flow: row;
+}
+
article {
background-color: #333;
border: 1px solid #444;
@@ -129,11 +173,20 @@ button {
border-radius: 4px;
}
+button#shutdown {
+ background-color: #f44336;
+}
+
button:hover {
background-color: white;
color: #4CAF50;
}
+button#shutdown:hover {
+ background-color: white;
+ color: #f44336;
+}
+
input[type="text"],
input[type="number"],
select,
@@ -178,4 +231,5 @@ li {
background-color: #2c2c2c;
border-radius: 4px;
word-wrap: break-word;
+ white-space: pre-wrap;
}
\ No newline at end of file
diff --git a/kinode/packages/settings/settings/Cargo.toml b/kinode/packages/settings/settings/Cargo.toml
index 8efff134..e478b1f4 100644
--- a/kinode/packages/settings/settings/Cargo.toml
+++ b/kinode/packages/settings/settings/Cargo.toml
@@ -10,7 +10,7 @@ simulation-mode = []
anyhow = "1.0"
base64 = "0.22.0"
bincode = "1.3.3"
-kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.6.1" }
+kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag="v0.7.2" }
rmp-serde = "1.2.0"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
diff --git a/kinode/packages/settings/settings/src/lib.rs b/kinode/packages/settings/settings/src/lib.rs
index 8e95cb97..50b44941 100644
--- a/kinode/packages/settings/settings/src/lib.rs
+++ b/kinode/packages/settings/settings/src/lib.rs
@@ -243,16 +243,18 @@ fn handle_http_request(
state: &mut SettingsState,
http_request: &http::IncomingHttpRequest,
) -> anyhow::Result<()> {
- state.fetch()?;
match http_request.method()?.as_str() {
- "GET" => Ok(http::send_response(
- http::StatusCode::OK,
- Some(HashMap::from([(
- String::from("Content-Type"),
- String::from("application/json"),
- )])),
- serde_json::to_vec(&state)?,
- )),
+ "GET" => {
+ state.fetch()?;
+ Ok(http::send_response(
+ http::StatusCode::OK,
+ Some(HashMap::from([(
+ String::from("Content-Type"),
+ String::from("application/json"),
+ )])),
+ serde_json::to_vec(&state)?,
+ ))
+ }
"POST" => {
let Some(blob) = get_blob() else {
return Ok(http::send_response(
@@ -263,6 +265,7 @@ fn handle_http_request(
};
let request = serde_json::from_slice::
(&blob.bytes)?;
let response = handle_settings_request(state, request);
+ state.fetch()?;
state.ws_update();
Ok(http::send_response(
http::StatusCode::OK,
diff --git a/kinode/packages/terminal/alias/Cargo.toml b/kinode/packages/terminal/alias/Cargo.toml
index 6d9f3c5f..94e3dca0 100644
--- a/kinode/packages/terminal/alias/Cargo.toml
+++ b/kinode/packages/terminal/alias/Cargo.toml
@@ -8,7 +8,7 @@ simulation-mode = []
[dependencies]
anyhow = "1.0"
-kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.7.0" }
+kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.7.2" }
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
wit-bindgen = "0.24.0"
diff --git a/kinode/packages/terminal/cat/Cargo.toml b/kinode/packages/terminal/cat/Cargo.toml
index c297f22f..7f06acfd 100644
--- a/kinode/packages/terminal/cat/Cargo.toml
+++ b/kinode/packages/terminal/cat/Cargo.toml
@@ -8,7 +8,7 @@ simulation-mode = []
[dependencies]
anyhow = "1.0"
-kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.7.0" }
+kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.7.2" }
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
wit-bindgen = "0.24.0"
diff --git a/kinode/packages/terminal/echo/Cargo.toml b/kinode/packages/terminal/echo/Cargo.toml
index 8cb489f5..b58f424f 100644
--- a/kinode/packages/terminal/echo/Cargo.toml
+++ b/kinode/packages/terminal/echo/Cargo.toml
@@ -8,7 +8,7 @@ simulation-mode = []
[dependencies]
anyhow = "1.0"
-kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.7.0" }
+kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.7.2" }
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
wit-bindgen = "0.24.0"
diff --git a/kinode/packages/terminal/hi/Cargo.toml b/kinode/packages/terminal/hi/Cargo.toml
index d0350a48..4e0fa17c 100644
--- a/kinode/packages/terminal/hi/Cargo.toml
+++ b/kinode/packages/terminal/hi/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2021"
simulation-mode = []
[dependencies]
-kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.7.0" }
+kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.7.2" }
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
wit-bindgen = "0.24.0"
diff --git a/kinode/packages/terminal/m/Cargo.toml b/kinode/packages/terminal/m/Cargo.toml
index 3f7e5197..9ff97a67 100644
--- a/kinode/packages/terminal/m/Cargo.toml
+++ b/kinode/packages/terminal/m/Cargo.toml
@@ -9,7 +9,7 @@ simulation-mode = []
[dependencies]
anyhow = "1.0"
clap = "4.4.18"
-kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.7.0" }
+kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.7.2" }
regex = "1.10.3"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
diff --git a/kinode/packages/terminal/namehash_to_name/Cargo.toml b/kinode/packages/terminal/namehash_to_name/Cargo.toml
index 275f19b8..dbc58a23 100644
--- a/kinode/packages/terminal/namehash_to_name/Cargo.toml
+++ b/kinode/packages/terminal/namehash_to_name/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2021"
simulation-mode = []
[dependencies]
-kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.7.0" }
+kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.7.2" }
rmp-serde = "1.1.2"
serde = { version = "1.0", features = ["derive"] }
wit-bindgen = "0.24.0"
diff --git a/kinode/packages/terminal/net_diagnostics/Cargo.toml b/kinode/packages/terminal/net_diagnostics/Cargo.toml
index 1940413c..17337636 100644
--- a/kinode/packages/terminal/net_diagnostics/Cargo.toml
+++ b/kinode/packages/terminal/net_diagnostics/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2021"
simulation-mode = []
[dependencies]
-kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.7.0" }
+kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.7.2" }
rmp-serde = "1.1.2"
serde = { version = "1.0", features = ["derive"] }
wit-bindgen = "0.24.0"
diff --git a/kinode/packages/terminal/peer/Cargo.toml b/kinode/packages/terminal/peer/Cargo.toml
index e69e94d8..711e81b9 100644
--- a/kinode/packages/terminal/peer/Cargo.toml
+++ b/kinode/packages/terminal/peer/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2021"
simulation-mode = []
[dependencies]
-kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.7.0" }
+kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.7.2" }
rmp-serde = "1.1.2"
serde = { version = "1.0", features = ["derive"] }
wit-bindgen = "0.24.0"
diff --git a/kinode/packages/terminal/peers/Cargo.toml b/kinode/packages/terminal/peers/Cargo.toml
index 1273755e..b1abc348 100644
--- a/kinode/packages/terminal/peers/Cargo.toml
+++ b/kinode/packages/terminal/peers/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2021"
simulation-mode = []
[dependencies]
-kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.7.0" }
+kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.7.2" }
rmp-serde = "1.1.2"
serde = { version = "1.0", features = ["derive"] }
wit-bindgen = "0.24.0"
diff --git a/kinode/packages/terminal/terminal/Cargo.toml b/kinode/packages/terminal/terminal/Cargo.toml
index d9c36cab..b083445f 100644
--- a/kinode/packages/terminal/terminal/Cargo.toml
+++ b/kinode/packages/terminal/terminal/Cargo.toml
@@ -9,7 +9,7 @@ simulation-mode = []
[dependencies]
anyhow = "1.0"
bincode = "1.3.3"
-kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.7.0" }
+kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.7.2" }
rand = "0.8"
regex = "1.10.3"
serde = { version = "1.0", features = ["derive"] }
diff --git a/kinode/packages/terminal/top/Cargo.toml b/kinode/packages/terminal/top/Cargo.toml
index 69f6d36b..24a20a0a 100644
--- a/kinode/packages/terminal/top/Cargo.toml
+++ b/kinode/packages/terminal/top/Cargo.toml
@@ -8,7 +8,7 @@ simulation-mode = []
[dependencies]
anyhow = "1.0"
-kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.7.0" }
+kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.7.2" }
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
wit-bindgen = "0.24.0"
diff --git a/kinode/packages/tester/test_runner/Cargo.toml b/kinode/packages/tester/test_runner/Cargo.toml
index c0752883..0f3e59e4 100644
--- a/kinode/packages/tester/test_runner/Cargo.toml
+++ b/kinode/packages/tester/test_runner/Cargo.toml
@@ -9,7 +9,7 @@ simulation-mode = []
[dependencies]
anyhow = "1.0"
bincode = "1.3.3"
-kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.7.0" }
+kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.7.2" }
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
thiserror = "1.0"
diff --git a/kinode/packages/tester/tester/Cargo.toml b/kinode/packages/tester/tester/Cargo.toml
index 65e17c48..9b830636 100644
--- a/kinode/packages/tester/tester/Cargo.toml
+++ b/kinode/packages/tester/tester/Cargo.toml
@@ -10,7 +10,7 @@ simulation-mode = []
anyhow = "1.0"
bincode = "1.3.3"
indexmap = "2.1"
-kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.7.0" }
+kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.7.2" }
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
thiserror = "1.0"
diff --git a/kinode/src/eth/subscription.rs b/kinode/src/eth/subscription.rs
index db33b7ef..65d45431 100644
--- a/kinode/src/eth/subscription.rs
+++ b/kinode/src/eth/subscription.rs
@@ -411,13 +411,11 @@ async fn maintain_remote_subscription(
&send_to_loop,
).await;
}
- incoming = net_error_rx.recv() => {
- if let Some(Err(_net_error)) = incoming {
- break EthSubError {
- id: sub_id,
- error: "subscription node-provider failed keepalive".to_string(),
- };
- }
+ _incoming = net_error_rx.recv() => {
+ break EthSubError {
+ id: sub_id,
+ error: "subscription node-provider failed keepalive".to_string(),
+ };
}
_ = tokio::time::sleep_until(last_received + two_hours) => {
break EthSubError {