Vendor deps.

This commit is contained in:
jimmy committed 2026-09-16 20:10:35 -04:00
1 parent 294527085e
commit 91e18fde3a
1714 files changed
+556667 -7

No files matched your search

+1
View File
@@ -0,0 +1 @@
{"files":{"Cargo.toml":"cddddd2f5a25156a1afca3460ddabea8e77283ef1870c12aa43a891b44b9f79d","LICENSE":"fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85","src/diagnostic_graph.rs":"c480b370f97805a7ca2bfd9b69b3b26755ed3e9c6d645640faae7c1dfcd9ebb8","src/diagnostic_node.rs":"1d3114a7daf9df4a2516853e6e274824853d40ab453995fa0173770bf4abe6c9","src/diagnostic_status.rs":"2cb49000d8150f9fd60cca61f41cbd59e2036b83d62b22922d85241060720d14","src/error.rs":"e5b06e19b6200ff808f0b2023d408fe12ec59ed8ec9bcc66d397ea5da9974259","src/lib.rs":"b9342371f268ef8e0d3e336d4ba80b74286370ca07ffd7b290d28c3af7e0417b","src/name_parsing.rs":"c9f3c6d9f08eb229d6912e85159304d2ea3568f40d2f220c9eee7d5a86e8644b","src/tree_view.rs":"7a271d782291bbf4df0ac6a536ba4ca015a2a7201e0e7acbdd91d841694653a4"},"package":null}
+50
View File
@@ -0,0 +1,50 @@
# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
#
# When uploading crates to the registry Cargo will automatically
# "normalize" Cargo.toml files for maximal compatibility
# with all versions of Cargo and also rewrite `path` dependencies
# to registry (e.g., crates.io) dependencies.
#
# If you are reading this file be aware that the original Cargo.toml
# will likely look very different (and much more reasonable).
# See Cargo.toml.orig for the original contents.
[package]
edition = "2024"
name = "j7s_diagnostics"
version = "0.1.0"
build = false
autolib = false
autobins = false
autoexamples = false
autotests = false
autobenches = false
readme = false
[features]
std = ["serde_json/std"]
[lib]
name = "j7s_diagnostics"
path = "src/lib.rs"
[dependencies.limbo_graph]
git = "https://git.jpace121.net/public/limbo_graph.git"
branch = "main"
[dependencies.serde]
version = "1.0"
features = [
"derive",
"alloc",
]
default-features = false
[dependencies.serde_json]
version = "1.0"
features = ["alloc"]
default-features = false
[dependencies.thiserror]
version = "2.0.18"
default-features = false
+373
View File
@@ -0,0 +1,373 @@
Mozilla Public License Version 2.0
==================================
1. Definitions
--------------
1.1. "Contributor"
means each individual or legal entity that creates, contributes to
the creation of, or owns Covered Software.
1.2. "Contributor Version"
means the combination of the Contributions of others (if any) used
by a Contributor and that particular Contributor's Contribution.
1.3. "Contribution"
means Covered Software of a particular Contributor.
1.4. "Covered Software"
means Source Code Form to which the initial Contributor has attached
the notice in Exhibit A, the Executable Form of such Source Code
Form, and Modifications of such Source Code Form, in each case
including portions thereof.
1.5. "Incompatible With Secondary Licenses"
means
(a) that the initial Contributor has attached the notice described
in Exhibit B to the Covered Software; or
(b) that the Covered Software was made available under the terms of
version 1.1 or earlier of the License, but not also under the
terms of a Secondary License.
1.6. "Executable Form"
means any form of the work other than Source Code Form.
1.7. "Larger Work"
means a work that combines Covered Software with other material, in
a separate file or files, that is not Covered Software.
1.8. "License"
means this document.
1.9. "Licensable"
means having the right to grant, to the maximum extent possible,
whether at the time of the initial grant or subsequently, any and
all of the rights conveyed by this License.
1.10. "Modifications"
means any of the following:
(a) any file in Source Code Form that results from an addition to,
deletion from, or modification of the contents of Covered
Software; or
(b) any new file in Source Code Form that contains any Covered
Software.
1.11. "Patent Claims" of a Contributor
means any patent claim(s), including without limitation, method,
process, and apparatus claims, in any patent Licensable by such
Contributor that would be infringed, but for the grant of the
License, by the making, using, selling, offering for sale, having
made, import, or transfer of either its Contributions or its
Contributor Version.
1.12. "Secondary License"
means either the GNU General Public License, Version 2.0, the GNU
Lesser General Public License, Version 2.1, the GNU Affero General
Public License, Version 3.0, or any later versions of those
licenses.
1.13. "Source Code Form"
means the form of the work preferred for making modifications.
1.14. "You" (or "Your")
means an individual or a legal entity exercising rights under this
License. For legal entities, "You" includes any entity that
controls, is controlled by, or is under common control with You. For
purposes of this definition, "control" means (a) the power, direct
or indirect, to cause the direction or management of such entity,
whether by contract or otherwise, or (b) ownership of more than
fifty percent (50%) of the outstanding shares or beneficial
ownership of such entity.
2. License Grants and Conditions
--------------------------------
2.1. Grants
Each Contributor hereby grants You a world-wide, royalty-free,
non-exclusive license:
(a) under intellectual property rights (other than patent or trademark)
Licensable by such Contributor to use, reproduce, make available,
modify, display, perform, distribute, and otherwise exploit its
Contributions, either on an unmodified basis, with Modifications, or
as part of a Larger Work; and
(b) under Patent Claims of such Contributor to make, use, sell, offer
for sale, have made, import, and otherwise transfer either its
Contributions or its Contributor Version.
2.2. Effective Date
The licenses granted in Section 2.1 with respect to any Contribution
become effective for each Contribution on the date the Contributor first
distributes such Contribution.
2.3. Limitations on Grant Scope
The licenses granted in this Section 2 are the only rights granted under
this License. No additional rights or licenses will be implied from the
distribution or licensing of Covered Software under this License.
Notwithstanding Section 2.1(b) above, no patent license is granted by a
Contributor:
(a) for any code that a Contributor has removed from Covered Software;
or
(b) for infringements caused by: (i) Your and any other third party's
modifications of Covered Software, or (ii) the combination of its
Contributions with other software (except as part of its Contributor
Version); or
(c) under Patent Claims infringed by Covered Software in the absence of
its Contributions.
This License does not grant any rights in the trademarks, service marks,
or logos of any Contributor (except as may be necessary to comply with
the notice requirements in Section 3.4).
2.4. Subsequent Licenses
No Contributor makes additional grants as a result of Your choice to
distribute the Covered Software under a subsequent version of this
License (see Section 10.2) or under the terms of a Secondary License (if
permitted under the terms of Section 3.3).
2.5. Representation
Each Contributor represents that the Contributor believes its
Contributions are its original creation(s) or it has sufficient rights
to grant the rights to its Contributions conveyed by this License.
2.6. Fair Use
This License is not intended to limit any rights You have under
applicable copyright doctrines of fair use, fair dealing, or other
equivalents.
2.7. Conditions
Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
in Section 2.1.
3. Responsibilities
-------------------
3.1. Distribution of Source Form
All distribution of Covered Software in Source Code Form, including any
Modifications that You create or to which You contribute, must be under
the terms of this License. You must inform recipients that the Source
Code Form of the Covered Software is governed by the terms of this
License, and how they can obtain a copy of this License. You may not
attempt to alter or restrict the recipients' rights in the Source Code
Form.
3.2. Distribution of Executable Form
If You distribute Covered Software in Executable Form then:
(a) such Covered Software must also be made available in Source Code
Form, as described in Section 3.1, and You must inform recipients of
the Executable Form how they can obtain a copy of such Source Code
Form by reasonable means in a timely manner, at a charge no more
than the cost of distribution to the recipient; and
(b) You may distribute such Executable Form under the terms of this
License, or sublicense it under different terms, provided that the
license for the Executable Form does not attempt to limit or alter
the recipients' rights in the Source Code Form under this License.
3.3. Distribution of a Larger Work
You may create and distribute a Larger Work under terms of Your choice,
provided that You also comply with the requirements of this License for
the Covered Software. If the Larger Work is a combination of Covered
Software with a work governed by one or more Secondary Licenses, and the
Covered Software is not Incompatible With Secondary Licenses, this
License permits You to additionally distribute such Covered Software
under the terms of such Secondary License(s), so that the recipient of
the Larger Work may, at their option, further distribute the Covered
Software under the terms of either this License or such Secondary
License(s).
3.4. Notices
You may not remove or alter the substance of any license notices
(including copyright notices, patent notices, disclaimers of warranty,
or limitations of liability) contained within the Source Code Form of
the Covered Software, except that You may alter any license notices to
the extent required to remedy known factual inaccuracies.
3.5. Application of Additional Terms
You may choose to offer, and to charge a fee for, warranty, support,
indemnity or liability obligations to one or more recipients of Covered
Software. However, You may do so only on Your own behalf, and not on
behalf of any Contributor. You must make it absolutely clear that any
such warranty, support, indemnity, or liability obligation is offered by
You alone, and You hereby agree to indemnify every Contributor for any
liability incurred by such Contributor as a result of warranty, support,
indemnity or liability terms You offer. You may include additional
disclaimers of warranty and limitations of liability specific to any
jurisdiction.
4. Inability to Comply Due to Statute or Regulation
---------------------------------------------------
If it is impossible for You to comply with any of the terms of this
License with respect to some or all of the Covered Software due to
statute, judicial order, or regulation then You must: (a) comply with
the terms of this License to the maximum extent possible; and (b)
describe the limitations and the code they affect. Such description must
be placed in a text file included with all distributions of the Covered
Software under this License. Except to the extent prohibited by statute
or regulation, such description must be sufficiently detailed for a
recipient of ordinary skill to be able to understand it.
5. Termination
--------------
5.1. The rights granted under this License will terminate automatically
if You fail to comply with any of its terms. However, if You become
compliant, then the rights granted under this License from a particular
Contributor are reinstated (a) provisionally, unless and until such
Contributor explicitly and finally terminates Your grants, and (b) on an
ongoing basis, if such Contributor fails to notify You of the
non-compliance by some reasonable means prior to 60 days after You have
come back into compliance. Moreover, Your grants from a particular
Contributor are reinstated on an ongoing basis if such Contributor
notifies You of the non-compliance by some reasonable means, this is the
first time You have received notice of non-compliance with this License
from such Contributor, and You become compliant prior to 30 days after
Your receipt of the notice.
5.2. If You initiate litigation against any entity by asserting a patent
infringement claim (excluding declaratory judgment actions,
counter-claims, and cross-claims) alleging that a Contributor Version
directly or indirectly infringes any patent, then the rights granted to
You by any and all Contributors for the Covered Software under Section
2.1 of this License shall terminate.
5.3. In the event of termination under Sections 5.1 or 5.2 above, all
end user license agreements (excluding distributors and resellers) which
have been validly granted by You or Your distributors under this License
prior to termination shall survive termination.
************************************************************************
* *
* 6. Disclaimer of Warranty *
* ------------------------- *
* *
* Covered Software is provided under this License on an "as is" *
* basis, without warranty of any kind, either expressed, implied, or *
* statutory, including, without limitation, warranties that the *
* Covered Software is free of defects, merchantable, fit for a *
* particular purpose or non-infringing. The entire risk as to the *
* quality and performance of the Covered Software is with You. *
* Should any Covered Software prove defective in any respect, You *
* (not any Contributor) assume the cost of any necessary servicing, *
* repair, or correction. This disclaimer of warranty constitutes an *
* essential part of this License. No use of any Covered Software is *
* authorized under this License except under this disclaimer. *
* *
************************************************************************
************************************************************************
* *
* 7. Limitation of Liability *
* -------------------------- *
* *
* Under no circumstances and under no legal theory, whether tort *
* (including negligence), contract, or otherwise, shall any *
* Contributor, or anyone who distributes Covered Software as *
* permitted above, be liable to You for any direct, indirect, *
* special, incidental, or consequential damages of any character *
* including, without limitation, damages for lost profits, loss of *
* goodwill, work stoppage, computer failure or malfunction, or any *
* and all other commercial damages or losses, even if such party *
* shall have been informed of the possibility of such damages. This *
* limitation of liability shall not apply to liability for death or *
* personal injury resulting from such party's negligence to the *
* extent applicable law prohibits such limitation. Some *
* jurisdictions do not allow the exclusion or limitation of *
* incidental or consequential damages, so this exclusion and *
* limitation may not apply to You. *
* *
************************************************************************
8. Litigation
-------------
Any litigation relating to this License may be brought only in the
courts of a jurisdiction where the defendant maintains its principal
place of business and such litigation shall be governed by laws of that
jurisdiction, without reference to its conflict-of-law provisions.
Nothing in this Section shall prevent a party's ability to bring
cross-claims or counter-claims.
9. Miscellaneous
----------------
This License represents the complete agreement concerning the subject
matter hereof. If any provision of this License is held to be
unenforceable, such provision shall be reformed only to the extent
necessary to make it enforceable. Any law or regulation which provides
that the language of a contract shall be construed against the drafter
shall not be used to construe this License against a Contributor.
10. Versions of the License
---------------------------
10.1. New Versions
Mozilla Foundation is the license steward. Except as provided in Section
10.3, no one other than the license steward has the right to modify or
publish new versions of this License. Each version will be given a
distinguishing version number.
10.2. Effect of New Versions
You may distribute the Covered Software under the terms of the version
of the License under which You originally received the Covered Software,
or under the terms of any subsequent version published by the license
steward.
10.3. Modified Versions
If you create software not governed by this License, and you want to
create a new license for such software, you may create and use a
modified version of this License if you rename the license and remove
any references to the name of the license steward (except to note that
such modified license differs from this License).
10.4. Distributing Source Code Form that is Incompatible With Secondary
Licenses
If You choose to distribute Source Code Form that is Incompatible With
Secondary Licenses under the terms of this version of the License, the
notice described in Exhibit B of this License must be attached.
Exhibit A - Source Code Form License Notice
-------------------------------------------
This Source Code Form is subject to the terms of the Mozilla Public
License, v. 2.0. If a copy of the MPL was not distributed with this
file, You can obtain one at http://mozilla.org/MPL/2.0/.
If it is not possible or desirable to put the notice in a particular
file, then You may include the notice in a location (such as a LICENSE
file in a relevant directory) where a recipient would be likely to look
for such a notice.
You may add additional accurate notices of copyright ownership.
Exhibit B - "Incompatible With Secondary Licenses" Notice
---------------------------------------------------------
This Source Code Form is "Incompatible With Secondary Licenses", as
defined by the Mozilla Public License, v. 2.0.
+450
View File
@@ -0,0 +1,450 @@
//
// Copyright 2026 James Pace
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at https://mozilla.org/MPL/2.0/.
//
// This Source Code Form is "Incompatible With Secondary Licenses", as
// defined by the Mozilla Public License, v. 2.0.
//
use alloc::borrow::ToOwned;
use alloc::collections::BTreeMap;
use alloc::collections::VecDeque;
use alloc::string::String;
use alloc::string::ToString;
use alloc::vec::Vec;
use crate::diagnostic_node::*;
use crate::diagnostic_status::*;
use crate::error::*;
use crate::name_parsing::*;
/// A graph of diagnostic statuses, following the general idea of
/// ros aggregated diagnostics.
///
/// Diagnostics are stored in a tree by their namme.
/// Their levels can be reconciled, and the individual
/// statuses queried.
#[derive(Clone)]
pub struct DiagnosticGraph {
graph: limbo_graph::Graph<DiagnosticNode>,
}
impl DiagnosticGraph {
/// Generate a empty graph.
pub fn new() -> Self {
Self {
graph: limbo_graph::Graph::<DiagnosticNode>::new(DiagnosticNode::Root),
}
}
/// Get the root key.
/// Needed to do searches in the graph outside of this crate.
pub fn root(&self) -> limbo_graph::Key {
self.graph.root_key()
}
/// Get the value of a specific element of the graph.
/// Will error if the key is not in the graph, or if the key
/// is the root, which doesn't have a value.
pub fn value_of(&self, key: &limbo_graph::Key) -> Result<DiagnosticStatus> {
let graph_value = self.graph.value_of(key)?;
let result = graph_value.value()?;
Ok(result.clone())
}
/// Find all the children of key as keys.
/// Will error if key is not in the graph.
pub fn children_of(&self, key: &limbo_graph::Key) -> Result<Vec<limbo_graph::Key>> {
let result = self.graph.children_of(key)?;
Ok(result)
}
/// Given a key, find the child of that key that has the provided name.
/// The provided name must be basic (have no slashes).
/// Will return None if there are no children with that name.
pub fn child_of_which_has_name(
&self,
parent: &limbo_graph::Key,
desired_child_name: &str,
) -> Result<Option<limbo_graph::Key>> {
if !name_is_basic(&desired_child_name.to_owned()) {
return Err(Error::from_msg("desired child name must be basic."));
}
let all_children = self.children_of(parent)?;
for child in all_children.iter() {
let child_name = self.value_of(&child)?.name();
if child_name == desired_child_name {
return Ok(Some(child.clone()));
}
}
return Ok(None);
}
/// Find the key of the item in the graph with the provided full name
/// (i.e. the name has slashes.)
pub fn key_from_full_name(&self, full_name: &String) -> Result<Option<limbo_graph::Key>> {
let name_as_vec = split_name(&full_name);
let mut cur_base_key = self.graph.root_key();
for cur_name in name_as_vec.iter() {
let key_of_cur_name = self.child_of_which_has_name(&cur_base_key, &cur_name)?;
if key_of_cur_name.is_none() {
return Ok(None);
}
cur_base_key = key_of_cur_name.unwrap();
}
return Ok(Some(cur_base_key));
}
/// Provide the full name for a given key. (i.e. the name will have slashes).
pub fn full_name_from_key(&self, key: &limbo_graph::Key) -> Result<String> {
let path_to_key = self.graph.backtrack_from_key(key)?;
let mut full_name = String::new();
for curr_key in path_to_key.iter() {
if *curr_key == self.graph.root_key() {
continue;
}
let status = self.value_of(&curr_key)?;
full_name = full_name + "/" + &status.name();
}
Ok(full_name)
}
/// Provide the value of a status from the full name.
pub fn value_from_name(
&self,
full_name: &String,
) -> Result<Option<(DiagnosticStatus, limbo_graph::Key)>> {
let key = self.key_from_full_name(full_name)?;
if key.is_none() {
return Ok(None);
}
let key = key.unwrap();
let value = self.value_of(&key)?;
return Ok(Some((value, key)));
}
/// Add a status to the graph.
/// The name of the status will be used to determine where in the
/// graph the status belongs.
pub fn add_status(&mut self, status: DiagnosticStatus) -> Result<()> {
// If I'm basic I just need to be added as a child of the root.
if status.name_is_basic() {
self.graph.add(
DiagnosticNode::DiagnosticStatus(status),
self.graph.root_key(),
)?;
return Ok(());
}
// Find this status' child name and parent's names
let parent_names = status.get_parent_names();
let mut cur_key = self.graph.root_key();
'parent_loop: for parent_name in parent_names.iter() {
let children = self.graph.children_of(&cur_key)?;
// There are no children of this parent, so we can add
// the parent and go to the next parent.
if children.len() == 0 {
let holder_for_parent = DiagnosticStatus::from_name(parent_name.clone());
cur_key = self
.graph
.add(DiagnosticNode::DiagnosticStatus(holder_for_parent), cur_key)?;
continue 'parent_loop;
}
// This parent does have children, look at them and
// update loop if appropriate.
for child in children {
let child_node = self.graph.value_of(&child)?;
if child_node.is_root() {
// A child node can't be root.
return Err(Error::from_msg("A child node can't be root!"));
}
if child_node.value()?.name() == *parent_name {
// The child node matched the parent we were looking for.
// Continue to find the next parent, with this key as the
// current key.
cur_key = child;
continue 'parent_loop;
}
}
// Parent wasn't any of the children. Add it and look for next parent.
let holder_for_parent = DiagnosticStatus::from_name(parent_name.clone());
cur_key = self
.graph
.add(DiagnosticNode::DiagnosticStatus(holder_for_parent), cur_key)?;
}
// We've updated all the parents, so we can add ourselves now.
// Do we already exist as a child of parent?
let children_of_this_parent = self.graph.children_of(&cur_key)?;
let mut names_of_children_of_this_parent = children_of_this_parent.iter().map(|x| {
self.graph
.value_of(&x)
.expect("Given child not in graph.")
.value()
.expect("Given root node as child?")
.name()
});
let child_in_children_of_this_parent =
names_of_children_of_this_parent.any(|x| x == status.get_child_name());
if !child_in_children_of_this_parent {
// If we don't we can be added.
self.graph.add(
DiagnosticNode::DiagnosticStatus(status.copy_with_child_name()),
cur_key,
)?;
}
Ok(())
}
/// Add all the statuses in the provided vector.
/// The name of the statuses will be used to determine where in the
/// graph the statuses belong.
pub fn add_status_vec(&mut self, statuses: &Vec<DiagnosticStatus>) -> Result<()> {
for status in statuses {
self.add_status(status.clone())?;
}
Ok(())
}
/// Update the levels for parent nodes based on the level of their children.
pub fn reconcile_levels(&mut self) -> Result<()> {
let leaf_keys = self.graph.find_leaf_keys()?;
'leaf_key_loop: for leaf_key in leaf_keys.iter() {
let mut child_key = leaf_key.clone();
while child_key != self.graph.root_key() {
let parent_key_opt = self.graph.parent_of(&child_key)?;
if parent_key_opt == None || parent_key_opt == Some(self.graph.root_key()) {
continue 'leaf_key_loop;
}
let parent_key = parent_key_opt.unwrap();
// Reconcile the parent values.
let parent_node = self.graph.value_of(&parent_key)?;
let parent_value = parent_node.value()?;
let child_node = self.graph.value_of(&child_key)?;
let child_value = child_node.value()?;
// if child level is worse than parent key.
// reset parent level.
if child_value.level() > parent_value.level() {
let replacement_parent = DiagnosticNode::from_status(
parent_value.copy_with_new_level(child_value.level()),
);
self.graph
.replace_value_of(&parent_key, replacement_parent)?;
}
// Push up the graph.
child_key = parent_key;
}
}
Ok(())
}
pub fn export_graph(&self) -> Result<Vec<DiagnosticStatus>> {
let keys_in_order = self.graph.get_keys_by_depth()?;
let mut statuses = Vec::<DiagnosticStatus>::new();
for key in keys_in_order.iter() {
if *key == self.root() {
// The root key will always be the first one through this
// loop.
continue;
}
let status_at_key = self.value_of(&key)?;
statuses.push(status_at_key.copy_with_new_name(self.full_name_from_key(&key)?));
}
Ok(statuses)
}
}
#[cfg(test)]
mod tests {
use super::*;
use alloc::vec;
fn make_a_status_with_name(name: &str) -> DiagnosticStatus {
let level = DiagnosticLevel::OK;
let message = "I'm ok";
let hardware_id = "";
let values = BTreeMap::<String, String>::new();
DiagnosticStatus::new(
level,
name.to_owned(),
message.to_owned(),
hardware_id.to_owned(),
values,
)
}
fn make_a_status_with_name_and_level(name: &str, level: DiagnosticLevel) -> DiagnosticStatus {
let level = level;
let message = "";
let hardware_id = "";
let values = BTreeMap::<String, String>::new();
DiagnosticStatus::new(
level,
name.to_owned(),
message.to_owned(),
hardware_id.to_owned(),
values,
)
}
#[test]
fn add_one_to_graph() -> Result<()> {
let mut graph = DiagnosticGraph::new();
graph.add_status(make_a_status_with_name("/a/b/c"))?;
let first_child_keys = graph.children_of(&graph.root())?;
assert!(first_child_keys.len() == 1);
let first_child_key = first_child_keys[0];
let first_child_value = graph.value_of(&first_child_key)?;
assert!(first_child_value.name() == "a");
let second_child_keys = graph.children_of(&first_child_key)?;
assert!(second_child_keys.len() == 1);
let second_child_key = second_child_keys[0];
let second_child_value = graph.value_of(&second_child_key)?;
assert!(second_child_value.name() == "b");
let third_child_keys = graph.children_of(&second_child_key)?;
assert!(third_child_keys.len() == 1);
let third_child_key = third_child_keys[0];
let third_child_value = graph.value_of(&third_child_key)?;
assert!(third_child_value.name() == "c");
assert!(third_child_value.level() == DiagnosticLevel::OK);
Ok(())
}
#[test]
fn add_multiple_to_graph() -> Result<()> {
let statuses = vec![
make_a_status_with_name("/a"),
make_a_status_with_name("/a/b"),
make_a_status_with_name("/a/b/c"),
make_a_status_with_name("/a/d/e"),
make_a_status_with_name("/a/d/f"),
make_a_status_with_name("/a/d"),
];
let mut graph = DiagnosticGraph::new();
graph.add_status_vec(&statuses)?;
let root_children = graph.children_of(&graph.root())?;
assert!(root_children.len() == 1);
assert!(graph.value_of(&root_children[0])?.name() == "a");
let children_of_a = graph.children_of(&root_children[0])?;
let mut children_of_a_names = children_of_a
.iter()
.map(|x| graph.value_of(&x).expect("Value of failed.").name());
assert!(children_of_a.len() == 2);
assert!(children_of_a_names.any(|x| x == "b"));
assert!(children_of_a_names.any(|x| x == "d"));
let b_key = graph.child_of_which_has_name(&root_children[0], "b")?;
assert!(b_key.is_some());
let b_children = graph.children_of(&b_key.unwrap())?;
assert!(b_children.len() == 1);
let d_key = graph.child_of_which_has_name(&root_children[0], "d")?;
assert!(d_key.is_some());
let d_children = graph.children_of(&d_key.unwrap())?;
assert!(d_children.len() == 2);
Ok(())
}
#[test]
fn key_name_connections() -> Result<()> {
let statuses = vec![
make_a_status_with_name("/a"),
make_a_status_with_name("/a/b"),
make_a_status_with_name("/a/d/e"),
make_a_status_with_name("/a/d"),
];
let mut graph = DiagnosticGraph::new();
graph.add_status_vec(&statuses)?;
let key_for_a = graph.key_from_full_name(&"/a".to_owned())?;
assert!(key_for_a == Some(1));
let key_for_e = graph.key_from_full_name(&"/a/d/e".to_owned())?;
assert!(key_for_e == Some(4));
let not_in_graph = graph.key_from_full_name(&"/a/b/c".to_owned())?;
assert!(not_in_graph == None);
let name_for_e = graph.full_name_from_key(&4)?;
assert!(name_for_e == "/a/d/e".to_owned());
Ok(())
}
#[test]
fn reconcile_graph() -> Result<()> {
let statuses = vec![
make_a_status_with_name_and_level("/a", DiagnosticLevel::UNSET),
make_a_status_with_name_and_level("/a/b", DiagnosticLevel::UNSET),
make_a_status_with_name_and_level("/a/b/c", DiagnosticLevel::OK),
make_a_status_with_name_and_level("/a/d/e", DiagnosticLevel::WARN),
make_a_status_with_name_and_level("/a/d", DiagnosticLevel::WARN),
make_a_status_with_name_and_level("/a/d/f", DiagnosticLevel::OK),
];
let mut graph = DiagnosticGraph::new();
graph.add_status_vec(&statuses)?;
graph.reconcile_levels()?;
let (a_status, _) = graph.value_from_name(&"/a".to_owned())?.unwrap();
assert!(a_status.level() == DiagnosticLevel::WARN);
let (d_status, _) = graph.value_from_name(&"/a/d".to_owned())?.unwrap();
assert!(d_status.level() == DiagnosticLevel::WARN);
Ok(())
}
#[test]
fn export_graph() -> Result<()> {
let statuses = vec![
make_a_status_with_name_and_level("/a", DiagnosticLevel::UNSET),
make_a_status_with_name_and_level("/a/b/c", DiagnosticLevel::OK),
make_a_status_with_name_and_level("/a/b", DiagnosticLevel::UNSET),
make_a_status_with_name_and_level("/a/d", DiagnosticLevel::UNSET),
];
let mut graph = DiagnosticGraph::new();
graph.add_status_vec(&statuses)?;
let exported = graph.export_graph()?;
assert!(exported.len() == 4);
// Searching doen the b tree first would also be
// technically correct, but this is the order the implementation
// is currently going with.
assert!(exported[0].name() == "/a");
assert!(exported[1].name() == "/a/d");
assert!(exported[2].name() == "/a/b");
assert!(exported[3].name() == "/a/b/c");
Ok(())
}
}
+39
View File
@@ -0,0 +1,39 @@
//
// Copyright 2026 James Pace
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at https://mozilla.org/MPL/2.0/.
//
// This Source Code Form is "Incompatible With Secondary Licenses", as
// defined by the Mozilla Public License, v. 2.0.
//
use crate::DiagnosticStatus;
use crate::error::{Error, Result};
#[derive(Clone)]
pub enum DiagnosticNode {
Root,
DiagnosticStatus(DiagnosticStatus),
}
impl limbo_graph::NodeValue for DiagnosticNode {}
impl DiagnosticNode {
pub fn from_status(status: DiagnosticStatus) -> Self {
Self::DiagnosticStatus(status)
}
pub fn is_root(&self) -> bool {
match self {
Self::Root => true,
_ => false,
}
}
pub fn value(&self) -> Result<&DiagnosticStatus> {
match self {
Self::DiagnosticStatus(value) => Ok(value),
_ => Err(Error::from_msg("Can't get value of root key.")),
}
}
}
+212
View File
@@ -0,0 +1,212 @@
//
// Copyright 2026 James Pace
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at https://mozilla.org/MPL/2.0/.
//
// This Source Code Form is "Incompatible With Secondary Licenses", as
// defined by the Mozilla Public License, v. 2.0.
//
use alloc::borrow::ToOwned;
use alloc::collections::BTreeMap;
use alloc::string::String;
use alloc::vec::Vec;
use core::default::Default;
use serde::{Deserialize, Serialize};
use crate::name_parsing::{get_child_name, get_parent_names, name_is_basic};
#[derive(Clone, PartialOrd, PartialEq, Default, Serialize, Deserialize)]
pub enum DiagnosticLevel {
#[default]
UNSET,
OK,
WARN,
ERROR,
STALE,
}
#[derive(Clone, Serialize, Deserialize)]
pub struct DiagnosticStatus {
level: DiagnosticLevel,
name: String,
message: String,
hardware_id: String,
values: BTreeMap<String, String>,
}
impl DiagnosticStatus {
pub fn new(
level: DiagnosticLevel,
name: String,
message: String,
hardware_id: String,
values: BTreeMap<String, String>,
) -> Self {
let cleaned_name = Self::clean_name(&name);
Self {
level: level,
name: cleaned_name,
message: message,
hardware_id: hardware_id,
values: values,
}
}
pub fn from_name(name: String) -> Self {
let level = DiagnosticLevel::UNSET;
let message = "";
let hardware_id = "";
let values = BTreeMap::<String, String>::new();
Self::new(
level,
name,
message.to_owned(),
hardware_id.to_owned(),
values,
)
}
pub fn level(&self) -> DiagnosticLevel {
self.level.clone()
}
pub fn name(&self) -> String {
self.name.clone()
}
pub fn message(&self) -> String {
self.message.clone()
}
pub fn hardware_id(&self) -> String {
self.hardware_id.clone()
}
pub fn values(&self) -> BTreeMap<String, String> {
self.values.clone()
}
pub fn keys(&self) -> Vec<String> {
self.values.keys().cloned().collect()
}
pub fn value(&self, key: &str) -> Option<String> {
let value = self.values.get(key);
if value.is_none() {
return None;
}
return Some(value.unwrap().clone());
}
pub fn name_is_basic(&self) -> bool {
name_is_basic(&self.name)
}
pub fn get_parent_names(&self) -> Vec<String> {
get_parent_names(&self.name)
}
pub fn get_child_name(&self) -> String {
get_child_name(&self.name)
}
pub fn copy_with_child_name(&self) -> Self {
let mut to_return: Self = self.clone();
to_return.name = self.get_child_name();
return to_return;
}
pub fn copy_with_new_level(&self, level: DiagnosticLevel) -> Self {
let mut to_return: Self = self.clone();
to_return.level = level;
return to_return;
}
pub fn copy_with_new_name(&self, name: String) -> Self {
let mut to_return = self.clone();
to_return.name = name;
return to_return;
}
fn clean_name(name: &str) -> String {
// Remove prefix "/"
let without_prefix = name.strip_prefix("/").unwrap_or(name);
// and suffix
let without_suffix = name.strip_suffix("/").unwrap_or(without_prefix);
return without_suffix.to_owned();
}
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn basic_diagnostic_creation() {
let level = DiagnosticLevel::OK;
let name = "/a/b/c";
let message = "I'm ok";
let hardware_id = "";
let values = BTreeMap::<String, String>::new();
let diag_status = DiagnosticStatus::new(
level,
name.to_owned(),
message.to_owned(),
hardware_id.to_owned(),
values,
);
assert!(diag_status.level() == DiagnosticLevel::OK);
}
#[test]
fn diagnostic_name_parsing() {
let level = DiagnosticLevel::OK;
let name = "/a/b/c";
let message = "I'm ok";
let hardware_id = "";
let values = BTreeMap::<String, String>::new();
let diag_status = DiagnosticStatus::new(
level,
name.to_owned(),
message.to_owned(),
hardware_id.to_owned(),
values,
);
assert!(!diag_status.name_is_basic());
let parent_names = diag_status.get_parent_names();
let child_name = diag_status.get_child_name();
assert!(parent_names[0] == "a");
assert!(parent_names[1] == "b");
assert!(child_name == "c");
}
#[test]
fn diagnostic_name_cleaning() {
let level = DiagnosticLevel::OK;
let name = "/a";
let message = "I'm ok";
let hardware_id = "";
let values = BTreeMap::<String, String>::new();
let diag_status = DiagnosticStatus::new(
level,
name.to_owned(),
message.to_owned(),
hardware_id.to_owned(),
values,
);
assert!(diag_status.name_is_basic());
assert!(diag_status.name() == "a");
}
}
+30
View File
@@ -0,0 +1,30 @@
//
// Copyright 2026 James Pace
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at https://mozilla.org/MPL/2.0/.
//
// This Source Code Form is "Incompatible With Secondary Licenses", as
// defined by the Mozilla Public License, v. 2.0.
//
use alloc::string::{String, ToString};
#[derive(thiserror::Error, Debug)]
pub enum Error {
#[error("GraphError: {0}")]
GraphError(#[from] limbo_graph::Error),
#[error("serde_json Error: {0}")]
JsonError(#[from] serde_json::Error),
#[error("Error from j7s_diagnostics: {0}")]
Msg(String),
}
impl Error {
pub fn from_msg(msg: &str) -> Self {
Error::Msg(msg.to_string())
}
}
pub type Result<T, E = Error> = core::result::Result<T, E>;
+30
View File
@@ -0,0 +1,30 @@
//
// Copyright 2026 James Pace
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at https://mozilla.org/MPL/2.0/.
//
// This Source Code Form is "Incompatible With Secondary Licenses", as
// defined by the Mozilla Public License, v. 2.0.
//
#![allow(unused_imports)]
#![cfg_attr(not(feature = "std"), no_std)]
extern crate alloc;
mod diagnostic_graph;
mod diagnostic_node;
mod diagnostic_status;
mod error;
mod name_parsing;
pub use crate::diagnostic_graph::*;
pub use crate::diagnostic_status::*;
pub use crate::error::*;
#[cfg(feature = "std")]
mod tree_view;
#[cfg(feature = "std")]
pub use crate::tree_view::*;
+82
View File
@@ -0,0 +1,82 @@
//
// Copyright 2026 James Pace
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at https://mozilla.org/MPL/2.0/.
//
// This Source Code Form is "Incompatible With Secondary Licenses", as
// defined by the Mozilla Public License, v. 2.0.
//
use alloc::borrow::ToOwned;
use alloc::string::String;
use alloc::vec::Vec;
pub fn name_is_basic(name: &String) -> bool {
// A basic name is one that doesn't have slashes in it other than the
// first character.
let is_not_basic = name.strip_prefix("/").unwrap_or(name).contains("/");
return !is_not_basic;
}
pub fn get_parent_names(name: &String) -> Vec<String> {
if name_is_basic(&name) {
return Vec::<String>::new();
}
let split: Vec<String> = name
.split("/")
.map(|x| x.to_owned())
.filter(|x| !x.is_empty())
.collect();
return split
.iter()
.take(split.len() - 1)
.map(|x| x.to_owned())
.collect();
}
pub fn get_child_name(name: &String) -> String {
if name_is_basic(&name) {
return name.clone();
}
let split: Vec<String> = name.split("/").map(|x| x.to_owned()).collect();
return split.last().unwrap().clone();
}
pub fn split_name(name: &String) -> Vec<String> {
name.split("/")
.map(|x| x.to_owned())
.filter(|x| !x.is_empty())
.collect()
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn test_is_basic() {
assert!(name_is_basic(&"a".to_owned()));
assert!(name_is_basic(&"/a".to_owned()));
assert!(!name_is_basic(&"/a/b".to_owned()));
}
#[test]
fn test_get_names() {
let name = "/a/b/c";
let parent_names = get_parent_names(&name.to_owned());
assert!(parent_names[0] == "a");
assert!(parent_names[1] == "b");
let child_name = get_child_name(&name.to_owned());
assert!(child_name == "c");
let split = split_name(&name.to_owned());
assert!(split[0] == "a");
assert!(split[1] == "b");
assert!(split[2] == "c");
}
}
+118
View File
@@ -0,0 +1,118 @@
//
// Copyright 2026 James Pace
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at https://mozilla.org/MPL/2.0/.
//
// This Source Code Form is "Incompatible With Secondary Licenses", as
// defined by the Mozilla Public License, v. 2.0.
//
use crate::diagnostic_graph::DiagnosticGraph;
use crate::diagnostic_status::DiagnosticStatus;
use crate::error::Result;
use alloc::string::String;
use alloc::vec::Vec;
use serde::{Deserialize, Serialize};
#[derive(Clone, Serialize, Deserialize)]
pub struct TreeView {
children: Vec<TreeViewNode>,
}
#[derive(Clone, Serialize, Deserialize)]
struct TreeViewNode {
id: String,
status: DiagnosticStatus,
children: Vec<TreeViewNode>,
}
impl TreeView {
fn get_nodes(key: &limbo_graph::Key, graph: &DiagnosticGraph) -> Result<Vec<TreeViewNode>> {
let children = graph.children_of(&key)?;
if children.len() == 0 {
return Ok(Vec::<TreeViewNode>::new());
}
let mut to_ret = Vec::<TreeViewNode>::new();
for child in children {
let status = graph.value_of(&child)?;
let node = TreeViewNode {
id: graph.full_name_from_key(&child)?,
status: status,
children: Self::get_nodes(&child, &graph)?,
};
to_ret.push(node);
}
// Make the order of same id'd (named) entries consistent.
to_ret.sort_by(|a, b| a.id.cmp(&b.id));
return Ok(to_ret);
}
pub fn from_graph(graph: &DiagnosticGraph) -> Result<TreeView> {
let view = TreeView {
children: Self::get_nodes(&graph.root(), &graph)?,
};
Ok(view)
}
pub fn to_json(&self) -> Result<String> {
Ok(serde_json::to_string(self)?)
}
}
#[cfg(test)]
mod tests {
use super::*;
use crate::*;
use alloc::collections::BTreeMap;
fn make_a_status_with_name(name: &str) -> DiagnosticStatus {
let level = DiagnosticLevel::OK;
let message = "I'm ok";
let hardware_id = "";
let values = BTreeMap::<String, String>::new();
DiagnosticStatus::new(
level,
name.to_owned(),
message.to_owned(),
hardware_id.to_owned(),
values,
)
}
#[test]
fn make_view() -> Result<()> {
let statuses = vec![
make_a_status_with_name("/a"),
make_a_status_with_name("/a/b"),
make_a_status_with_name("/a/b/c"),
make_a_status_with_name("/a/d/e"),
make_a_status_with_name("/a/d"),
];
let mut graph = DiagnosticGraph::new();
graph.add_status_vec(&statuses)?;
let view = TreeView::from_graph(&graph)?;
// First level is just a
assert!(view.children.len() == 1);
// a has children b and d.
assert!(view.children[0].children.len() == 2);
// regardless is this is b or d, it has one child.
// TODO: This isn't the best test.
assert!(view.children[0].children[0].children.len() == 1);
// Just to confirm it doesn't panic.
let _js = view.to_json()?;
Ok(())
}
}