fix: NodeInfo 2.0 schema compliance, bump 0.4.5

Remove invalid $schema, add required services/metadata fields.
Configurable via with_nodeinfo_services/with_nodeinfo_metadata.

Closes GKaszewski/movies-diary#2

src/data.rs

@@ -71,6 +71,9 @@ pub struct FederationData {
     pub(crate) software_name: String,
     pub(crate) event_publisher: Option<Arc<dyn EventPublisher>>,
     pub(crate) actor_cache_ttl: std::time::Duration,
+    pub(crate) nodeinfo_services_inbound: Vec<String>,
+    pub(crate) nodeinfo_services_outbound: Vec<String>,
+    pub(crate) nodeinfo_metadata: serde_json::Value,
 }
 
 impl FederationData {
@@ -110,6 +113,20 @@ impl FederationData {
             software_name,
             event_publisher,
             actor_cache_ttl,
+            nodeinfo_services_inbound: vec![],
+            nodeinfo_services_outbound: vec![],
+            nodeinfo_metadata: serde_json::json!({}),
         }
     }
+
+    pub fn with_nodeinfo_services(mut self, inbound: Vec<String>, outbound: Vec<String>) -> Self {
+        self.nodeinfo_services_inbound = inbound;
+        self.nodeinfo_services_outbound = outbound;
+        self
+    }
+
+    pub fn with_nodeinfo_metadata(mut self, metadata: serde_json::Value) -> Self {
+        self.nodeinfo_metadata = metadata;
+        self
+    }
 }

src/nodeinfo.rs

@@ -6,7 +6,6 @@ use crate::data::FederationData;
 use crate::error::Error;
 
 const NODEINFO_2_0_REL: &str = "http://nodeinfo.diaspora.software/ns/schema/2.0";
-const NODEINFO_2_0_SCHEMA: &str = "http://nodeinfo.diaspora.software/ns/schema/2.0#";
 
 #[derive(Serialize)]
 pub struct NodeInfoWellKnown {
@@ -37,16 +36,22 @@ pub struct NodeInfoUsers {
     pub total: usize,
 }
 
+#[derive(Serialize)]
+pub struct NodeInfoServices {
+    pub inbound: Vec<String>,
+    pub outbound: Vec<String>,
+}
+
 #[derive(Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct NodeInfo {
-    #[serde(rename = "$schema")]
-    pub schema: String,
     pub version: String,
     pub software: NodeInfoSoftware,
     pub protocols: Vec<String>,
-    pub usage: NodeInfoUsage,
+    pub services: NodeInfoServices,
     pub open_registrations: bool,
+    pub usage: NodeInfoUsage,
+    pub metadata: serde_json::Value,
 }
 
 pub async fn nodeinfo_well_known_handler(
@@ -66,18 +71,22 @@ pub async fn nodeinfo_handler(data: Data<FederationData>) -> Result<Json<NodeInf
     let local_posts = data.content_reader.count_local_posts().await.unwrap_or(0);
 
     Ok(Json(NodeInfo {
-        schema: NODEINFO_2_0_SCHEMA.to_string(),
         version: "2.0".to_string(),
         software: NodeInfoSoftware {
             name: data.software_name.clone(),
             version: env!("CARGO_PKG_VERSION").to_string(),
         },
         protocols: vec!["activitypub".to_string()],
+        services: NodeInfoServices {
+            inbound: data.nodeinfo_services_inbound.clone(),
+            outbound: data.nodeinfo_services_outbound.clone(),
+        },
+        open_registrations: data.allow_registration,
         usage: NodeInfoUsage {
             users: NodeInfoUsers { total: user_count },
             local_posts,
         },
-        open_registrations: data.allow_registration,
+        metadata: data.nodeinfo_metadata.clone(),
     }))
 }
 

src/tests/nodeinfo.rs

@@ -19,27 +19,31 @@ fn nodeinfo_well_known_serializes_correctly() {
 #[test]
 fn nodeinfo_serializes_camel_case() {
     let doc = NodeInfo {
-        schema: "http://nodeinfo.diaspora.software/ns/schema/2.0#".to_string(),
         version: "2.0".to_string(),
         software: NodeInfoSoftware {
             name: "my-app".to_string(),
             version: "0.1.0".to_string(),
         },
         protocols: vec!["activitypub".to_string()],
+        services: NodeInfoServices {
+            inbound: vec![],
+            outbound: vec![],
+        },
+        open_registrations: false,
         usage: NodeInfoUsage {
             users: NodeInfoUsers { total: 3 },
             local_posts: 42,
         },
-        open_registrations: false,
+        metadata: serde_json::json!({}),
     };
     let json = serde_json::to_value(&doc).unwrap();
-    assert_eq!(
-        json["$schema"],
-        "http://nodeinfo.diaspora.software/ns/schema/2.0#"
-    );
+    assert!(json.get("$schema").is_none());
     assert_eq!(json["version"], "2.0");
     assert_eq!(json["software"]["name"], "my-app");
     assert_eq!(json["usage"]["users"]["total"], 3);
     assert_eq!(json["usage"]["localPosts"], 42);
     assert_eq!(json["openRegistrations"], false);
+    assert_eq!(json["services"]["inbound"], serde_json::json!([]));
+    assert_eq!(json["services"]["outbound"], serde_json::json!([]));
+    assert_eq!(json["metadata"], serde_json::json!({}));
 }