Merge pull request #787 from netsirius/build-and-publish-email-web

Build and publish email web

apps/freenet-email-app/Cargo.toml

@@ -1,6 +1,6 @@
 [workspace]
 resolver = "2"
-members = ["contracts/*", "delegates/*", "web"]
+members = ["contracts/*", "web", "web/container"]
 
 [profile.dev.package."*"]
 opt-level = 3
@@ -15,7 +15,6 @@ strip = true
 
 [workspace.dependencies]
 chrono = "0.4"
-ed25519-dalek = { version = "1", features = ["serde"], default-features = false }
 rsa = { version = "0.9.2", default-features = false, features = ["serde", "pem", "sha2"] }
 serde = "1"
 serde_json = "1"

apps/freenet-email-app/Makefile

@@ -19,7 +19,9 @@ endif
 build: \
 	build-tool \
 	generate-id-manager-key \
-	build-inbox 
+	build-inbox \
+	build-webapp \
+	publish-webapp
 
 build-tool:
 	cd $(LOCUTUS_DIR)/crates/locutus-node && cargo build --release
@@ -46,8 +48,18 @@ run-node:
 
 run-web:
 	cd $(INBOX_WEB_DIR)
-	trunk build --features use-node --no-default-features
-	trunk serve --features use-node --no-default-features --port 57616
+	dx build --target index.html --platform web --features use-node
+	dx serve --features use-node --port 57616
+
+build-webapp:
+	cd $(INBOX_WEB_DIR)
+	dx build --target index.html --release --platform web --features use-node
+	sed -i 's@/./assets@./assets@g' dist/index.html
+	ldt build
+
+publish-webapp:
+	cd $(INBOX_WEB_DIR)
+	ldt publish --code build/locutus/freenet_email_app_web contract --state build/locutus/contract-state
 
 clean:
 	rm -rf $(CARGO_TARGET_DIR)

apps/freenet-email-app/contracts/inbox/src/lib.rs

@@ -450,7 +450,7 @@ impl ContractInterface for Inbox {
         let missing_related: Vec<_> = missing_related
             .into_iter()
             .filter_map(|missing| {
-                (!allocation_records.contains_key(&missing)).then(|| RelatedContract {
+                (!allocation_records.contains_key(&missing)).then_some(RelatedContract {
                     contract_instance_id: missing,
                     mode: RelatedMode::StateOnce,
                 })
@@ -495,14 +495,11 @@ impl ContractInterface for Inbox {
 #[cfg(all(feature = "contract", test))]
 mod tests {
     use super::*;
-    use rsa::{pkcs1::DecodeRsaPrivateKey, Pkcs1v15Sign, RsaPrivateKey};
+    use rsa::{rand_core::OsRng, Pkcs1v15Sign, RsaPrivateKey};
 
     #[test]
     fn validate_test() -> Result<(), Box<dyn std::error::Error>> {
-        let private_key = RsaPrivateKey::from_pkcs1_pem(include_str!(
-            "../../../web/examples/rsa4096-id-1-priv.pem"
-        ))
-        .unwrap();
+        let private_key = RsaPrivateKey::new(&mut OsRng, 32).unwrap();
         let public_key = private_key.to_public_key();
 
         let params: Parameters = InboxParams {

apps/freenet-email-app/web/Cargo.toml

@@ -18,7 +18,7 @@ bs58 = "0.5"
 arc-swap = "1.6"
 rand_chacha = "0.3"
 chrono = { workspace = true, features = ["wasmbind"] }
-dioxus = { git = "https://github.com/DioxusLabs/dioxus.git", rev = "0fec47d" }
+dioxus = "0.4.0"
 futures = "0.3"
 rsa = { workspace = true }
 chacha20poly1305 = "0.10"
@@ -38,7 +38,7 @@ locutus-aft-interface = { workspace = true }
 identity-management = { path = "../../../modules/identity-management" }
 
 [target.'cfg(target_family = "wasm")'.dependencies]
-dioxus-web = { git = "https://github.com/DioxusLabs/dioxus.git", rev = "0fec47d" }
+dioxus-web = "0.4.0"
 getrandom = { version = "*", features = ["js"] }
 locutus-stdlib = { workspace = true, features = ["net"] }
 serde-wasm-bindgen = { version = "0.5" }
@@ -58,7 +58,7 @@ features = [
 ]
 
 [target.'cfg(not(target_family = "wasm"))'.dependencies]
-dioxus-desktop = { git = "https://github.com/DioxusLabs/dioxus.git", rev = "0fec47d" }
+dioxus-desktop = "0.4.0"
 
 [features]
 default = ["ui-testing"]

apps/freenet-email-app/web/Dioxus.toml

@@ -0,0 +1,74 @@
+[application]
+
+# dioxus project name
+name = "freenet-email-app"
+
+# default platfrom
+# you can also use `dx serve/build --platform XXX` to use other platform
+# value: web | desktop
+default_platform = "web"
+
+# Web `build` & `serve` dist path
+out_dir = "dist"
+
+# resource (static) file folder
+asset_dir = "public"
+
+[web.app]
+
+# HTML title tag content
+title = ""
+
+[web.watcher]
+
+index_on_404 = true
+
+watch_path = ["src"]
+
+# include `assets` in web platform
+[web.resource]
+
+# CSS style file
+style = []
+
+# Javascript code file
+script = []
+
+[web.resource.dev]
+
+# Javascript code file
+# serve: [dev-server] only
+script = []
+
+[application.plugins]
+
+available = true
+
+required = []
+
+[bundler]
+# Bundle identifier
+identifier = ""
+
+# Bundle publisher
+publisher = ""
+
+# Bundle icon
+icon = ["icons/icon.png"]
+
+# Bundle resources
+resources = ["public/*"]
+
+# Bundle copyright
+copyright = ""
+
+# Bundle category
+category = "Utility"
+
+# Bundle short description
+short_description = "An amazing dioxus application."
+
+# Bundle long description
+long_description = """
+An amazing dioxus application.
+"""

apps/freenet-email-app/web/container/Cargo.toml

@@ -0,0 +1,13 @@
+[package]
+name = "freenet-email-app-web"
+version = "0.0.0"
+edition = "2021"
+rust-version = "1.71.1"
+resolver = "2"
+publish = false
+
+[dependencies]
+locutus-stdlib = { workspace = true }
+
+[lib]
+crate-type = ["cdylib"]

apps/freenet-email-app/web/container/src/lib.rs

@@ -0,0 +1,47 @@
+use locutus_stdlib::prelude::*;
+
+struct Contract;
+
+// TODO: verify that the state is signed by a pub/key pair
+// ~/.locutus/secrets/keys/keypair1.json
+
+#[contract]
+impl ContractInterface for Contract {
+    fn validate_state(
+        _parameters: Parameters<'static>,
+        _state: State<'static>,
+        _related: RelatedContracts,
+    ) -> Result<ValidateResult, ContractError> {
+        Ok(ValidateResult::Valid)
+    }
+
+    fn validate_delta(
+        _parameters: Parameters<'static>,
+        _delta: StateDelta<'static>,
+    ) -> Result<bool, ContractError> {
+        Ok(true)
+    }
+
+    fn update_state(
+        _parameters: Parameters<'static>,
+        state: State<'static>,
+        _updates: Vec<UpdateData>,
+    ) -> Result<UpdateModification<'static>, ContractError> {
+        Ok(UpdateModification::valid(state))
+    }
+
+    fn summarize_state(
+        _parameters: Parameters<'static>,
+        _state: State<'static>,
+    ) -> Result<StateSummary<'static>, ContractError> {
+        Ok(StateSummary::from(vec![]))
+    }
+
+    fn get_state_delta(
+        _parameters: Parameters<'static>,
+        _state: State<'static>,
+        _summary: StateSummary<'static>,
+    ) -> Result<StateDelta<'static>, ContractError> {
+        Ok(StateDelta::from(vec![]))
+    }
+}

apps/freenet-email-app/web/locutus.toml

@@ -0,0 +1,8 @@
+[contract]
+type = "webapp"
+lang = "rust"
+
+[webapp]
+
+[webapp.state-sources]
+source_dirs = ["dist"]