remove iana_media_types

unavi-xyz · May 7, 2024 · 9db8756 · 9db8756
1 parent 135f7d9
commit 9db8756
Show file tree

Hide file tree

Showing 16 changed files with 43 additions and 92 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/README.md b/README.md
@@ -10,7 +10,6 @@ Rust implementation of a [Decentralized Web Node](https://identity.foundation/de
 use std::sync::Arc;
 
 use dwn::{actor::Actor, message::Data, store::SurrealStore, DWN};
-use iana_media_types::Application;
 use surrealdb::{Surreal, engine::local::Mem};
 
 #[tokio::main]
@@ -31,7 +30,7 @@ async fn main() {
     let create = actor
         .create_record()
         .data(data.clone())
-        .data_format(Application::Json.into())
+        .data_format("application/json".to_string())
         .process()
         .await
         .unwrap();

diff --git a/crates/dwn-server/tests/schema.rs b/crates/dwn-server/tests/schema.rs
@@ -3,7 +3,7 @@ use std::sync::Arc;
 use axum::{routing::get, Json, Router};
 use dwn::{
     actor::{records::Encryption, Actor},
-    message::{descriptor::iana_media_types::Application, Data},
+    message::Data,
     store::SurrealStore,
     DWN,
 };
@@ -56,7 +56,7 @@ async fn test_records_schema() {
     let create = actor
         .create_record()
         .data(data.clone())
-        .data_format(Application::Json.into())
+        .data_format("application/json".to_string())
         .schema(schema_url.clone())
         .process()
         .await;
@@ -67,7 +67,7 @@ async fn test_records_schema() {
     let create = actor
         .create_record()
         .data(data.clone())
-        .data_format(Application::Json.into())
+        .data_format("application/json".to_string())
         .schema(schema_url.clone())
         .process()
         .await
@@ -87,7 +87,7 @@ async fn test_records_schema() {
     let create_two = actor
         .create_record()
         .data(data.clone())
-        .data_format(Application::Json.into())
+        .data_format("application/json".to_string())
         .schema(schema_url.clone())
         .process()
         .await
@@ -101,15 +101,15 @@ async fn test_records_schema() {
     let update = actor
         .update_record(create.record_id.clone(), create.entry_id.clone())
         .data(data.clone())
-        .data_format(Application::Json.into())
+        .data_format("application/json".to_string())
         .process()
         .await;
     assert!(update.is_err());
 
     let update = actor
         .update_record(create.record_id.clone(), create.entry_id.clone())
         .data(data.clone())
-        .data_format(Application::Json.into())
+        .data_format("application/json".to_string())
         .schema(schema_url.clone())
         .process()
         .await;
@@ -120,15 +120,15 @@ async fn test_records_schema() {
     let update = actor
         .update_record(create.record_id.clone(), create.entry_id.clone())
         .data(data.clone())
-        .data_format(Application::Json.into())
+        .data_format("application/json".to_string())
         .process()
         .await;
     assert!(update.is_err());
 
     let update = actor
         .update_record(create.record_id.clone(), create.entry_id.clone())
         .data(data.clone())
-        .data_format(Application::Json.into())
+        .data_format("application/json".to_string())
         .schema("http://localhost:1234/new-schema.json".to_string())
         .process()
         .await;
@@ -139,7 +139,7 @@ async fn test_records_schema() {
     let update = actor
         .update_record(create.record_id.clone(), create.entry_id.clone())
         .data(data.clone())
-        .data_format(Application::Json.into())
+        .data_format("application/json".to_string())
         .schema(schema_url.clone())
         .encryption(&encryption)
         .process()
@@ -149,7 +149,7 @@ async fn test_records_schema() {
     let update = actor
         .update_record(create.record_id.clone(), create.entry_id.clone())
         .data(data.clone())
-        .data_format(Application::Json.into())
+        .data_format("application/json".to_string())
         .schema(schema_url)
         .process()
         .await

diff --git a/crates/dwn-server/tests/send.rs b/crates/dwn-server/tests/send.rs
@@ -12,7 +12,6 @@ use didkit::{
 };
 use dwn::{
     actor::{Actor, MessageBuilder},
-    message::descriptor::iana_media_types::Application,
     store::SurrealStore,
     DWN,
 };
@@ -104,7 +103,7 @@ async fn test_send() {
     let create = alice_osaka
         .create_record()
         .data(data.to_vec())
-        .data_format(Application::Json.into())
+        .data_format("application/json".to_string())
         .published(true)
         .process()
         .await

diff --git a/crates/dwn-server/tests/sync.rs b/crates/dwn-server/tests/sync.rs
@@ -2,10 +2,7 @@ use std::sync::Arc;
 
 use dwn::{
     actor::Actor,
-    message::{
-        descriptor::{iana_media_types::Application, Descriptor},
-        Data,
-    },
+    message::{descriptor::Descriptor, Data},
     store::{DataStore, MessageStore, SurrealStore},
     DWN,
 };
@@ -79,7 +76,7 @@ async fn test_read_remote() {
     let create = alice_osaka
         .create_record()
         .data(data.clone())
-        .data_format(Application::Json.into())
+        .data_format("application/json".to_string())
         .process()
         .await
         .unwrap();
@@ -125,7 +122,7 @@ async fn test_sync_push() {
     let create = alice_kyoto
         .create_record()
         .data(data.clone())
-        .data_format(Application::Json.into())
+        .data_format("application/json".to_string())
         .process()
         .await
         .unwrap();
@@ -168,7 +165,7 @@ async fn test_sync_pull_update() {
     let create = alice_osaka
         .create_record()
         .data(data.clone())
-        .data_format(Application::Json.into())
+        .data_format("application/json".to_string())
         .process()
         .await
         .unwrap();
@@ -189,7 +186,7 @@ async fn test_sync_pull_update() {
     let update = alice_osaka
         .update_record(create.record_id.clone(), create.entry_id.clone())
         .data(new_data.clone())
-        .data_format(Application::Json.into())
+        .data_format("application/json".to_string())
         .process()
         .await
         .unwrap();
@@ -234,7 +231,7 @@ async fn test_sync_pull_many_updates() {
     let create = alice_osaka
         .create_record()
         .data(data.clone())
-        .data_format(Application::Json.into())
+        .data_format("application/json".to_string())
         .process()
         .await
         .unwrap();
@@ -255,7 +252,7 @@ async fn test_sync_pull_many_updates() {
     let update = alice_osaka
         .update_record(create.record_id.clone(), create.entry_id.clone())
         .data(new_data.clone())
-        .data_format(Application::Json.into())
+        .data_format("application/json".to_string())
         .process()
         .await
         .unwrap();
@@ -266,7 +263,7 @@ async fn test_sync_pull_many_updates() {
     let update = alice_osaka
         .update_record(create.record_id.clone(), update.entry_id.clone())
         .data(newer_data.clone())
-        .data_format(Application::Json.into())
+        .data_format("application/json".to_string())
         .process()
         .await
         .unwrap();
@@ -311,7 +308,7 @@ async fn test_sync_pull_delete() {
     let create = alice_osaka
         .create_record()
         .data(data.clone())
-        .data_format(Application::Json.into())
+        .data_format("application/json".to_string())
         .process()
         .await
         .unwrap();
@@ -378,7 +375,7 @@ async fn test_sync_pull_delete_after_update() {
     let create = alice_osaka
         .create_record()
         .data(data.clone())
-        .data_format(Application::Json.into())
+        .data_format("application/json".to_string())
         .process()
         .await
         .unwrap();
@@ -400,7 +397,7 @@ async fn test_sync_pull_delete_after_update() {
     let update = alice_osaka
         .update_record(create.record_id.clone(), create.entry_id.clone())
         .data(new_data.clone())
-        .data_format(Application::Json.into())
+        .data_format("application/json".to_string())
         .process()
         .await
         .unwrap();
@@ -465,7 +462,7 @@ async fn test_sync_pull_delete_after_local_update() {
     let create = alice_osaka
         .create_record()
         .data(data.clone())
-        .data_format(Application::Json.into())
+        .data_format("application/json".to_string())
         .process()
         .await
         .unwrap();
@@ -486,7 +483,7 @@ async fn test_sync_pull_delete_after_local_update() {
     let update = alice_kyoto
         .update_record(create.record_id.clone(), create.entry_id.clone())
         .data(new_data.clone())
-        .data_format(Application::Json.into())
+        .data_format("application/json".to_string())
         .process()
         .await
         .unwrap();

diff --git a/crates/dwn/Cargo.toml b/crates/dwn/Cargo.toml
@@ -18,7 +18,6 @@ anyhow = "1.0.82"
 base64 = "0.22.0"
 did-method-key = "0.2.2"
 didkit.workspace = true
-iana-media-types = "0.1.2"
 jsonschema = { version = "0.17.1", default-features = false, features = ["draft201909", "draft202012"] }
 libipld = { version = "0.16.0", features = ["serde-codec"] }
 libipld-cbor = "0.16.0"

diff --git a/crates/dwn/src/actor/records/write.rs b/crates/dwn/src/actor/records/write.rs
@@ -1,6 +1,5 @@
 use aes_gcm::{aead::OsRng, Aes256Gcm, KeyInit};
 use base64::{engine::general_purpose::URL_SAFE_NO_PAD, Engine};
-use iana_media_types::MediaType;
 use semver::Version;
 use time::OffsetDateTime;
 
@@ -27,7 +26,7 @@ pub struct RecordsWriteBuilder<'a, D: DataStore, M: MessageStore> {
     actor: &'a Actor<D, M>,
     authorized: bool,
     data: Option<Vec<u8>>,
-    data_format: Option<MediaType>,
+    data_format: Option<String>,
     encryption: Option<&'a Encryption>,
     parent_context_id: Option<String>,
     parent_id: Option<String>,
@@ -182,7 +181,7 @@ impl<'a, D: DataStore, M: MessageStore> RecordsWriteBuilder<'a, D, M> {
     }
 
     /// Format of the data.
-    pub fn data_format(mut self, data_format: MediaType) -> Self {
+    pub fn data_format(mut self, data_format: String) -> Self {
         self.data_format = Some(data_format);
         self
     }

diff --git a/crates/dwn/src/lib.rs b/crates/dwn/src/lib.rs
@@ -6,7 +6,6 @@
 //! use std::sync::Arc;
 //!
 //! use dwn::{actor::Actor, message::Data, store::SurrealStore, DWN};
-//! use iana_media_types::Application;
 //! use surrealdb::{Surreal, engine::local::Mem};
 //!
 //! #[tokio::main]
@@ -27,7 +26,7 @@
 //!     let create = actor
 //!         .create_record()
 //!         .data(data.clone())
-//!         .data_format(Application::Json.into())
+//!         .data_format("text/plain".to_string())
 //!         .process()
 //!         .await
 //!         .unwrap();

diff --git a/crates/dwn/src/message/descriptor/mod.rs b/crates/dwn/src/message/descriptor/mod.rs
@@ -10,8 +10,6 @@ use self::{
 pub mod protocols;
 pub mod records;
 
-pub use iana_media_types;
-
 #[derive(Clone, Debug, Deserialize, Serialize, PartialEq)]
 pub enum Interface {
     Permissions,

diff --git a/crates/dwn/src/message/descriptor/protocols/configure.rs b/crates/dwn/src/message/descriptor/protocols/configure.rs
@@ -1,6 +1,5 @@
 use std::collections::HashMap;
 
-use iana_media_types::MediaType;
 use semver::Version;
 use serde::{Deserialize, Deserializer, Serialize};
 
@@ -67,7 +66,7 @@ impl ProtocolDefinition {
 #[derive(Clone, Debug, Default, Deserialize, Serialize, PartialEq)]
 pub struct StructureType {
     #[serde(rename = "dataFormat", skip_serializing_if = "Option::is_none")]
-    pub data_format: Option<Vec<MediaType>>,
+    pub data_format: Option<Vec<String>>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub schema: Option<String>,
 }