Misc (#3087)

* help ios downlaod .crt and add begin add masked for addresses

* only require and show CA for public domain if addSsl

* fix type and revert i18n const

* feat: add address masking and adjust design (#3088)

* feat: add address masking and adjust design

* update lockfile

* chore: move eye button to actions

* chore: refresh notifications and handle action error

* static width for health check name

---------

Co-authored-by: Matt Hill <mattnine@protonmail.com>

* hide certificate authorities tab

* alpha.17

* add waiting health check status

* remove "on" from waiting message

* reject on abort in `.watch`

* id migration: nostr -> nostr-rs-relay

* health check waiting state

* use interface type for launch button

* better wording for masked

* cleaner

* sdk improvements

* fix type error

* fix notification badge issue

---------

Co-authored-by: Alex Inkin <alexander@inkin.ru>
Co-authored-by: Aiden McClelland <me@drbonez.dev>

core/src/version/mod.rs

@@ -56,8 +56,9 @@ mod v0_4_0_alpha_13;
 mod v0_4_0_alpha_14;
 mod v0_4_0_alpha_15;
 mod v0_4_0_alpha_16;
+mod v0_4_0_alpha_17;
 
-pub type Current = v0_4_0_alpha_16::Version; // VERSION_BUMP
+pub type Current = v0_4_0_alpha_17::Version; // VERSION_BUMP
 
 impl Current {
     #[instrument(skip(self, db))]
@@ -175,7 +176,8 @@ enum Version {
     V0_4_0_alpha_13(Wrapper<v0_4_0_alpha_13::Version>),
     V0_4_0_alpha_14(Wrapper<v0_4_0_alpha_14::Version>),
     V0_4_0_alpha_15(Wrapper<v0_4_0_alpha_15::Version>),
-    V0_4_0_alpha_16(Wrapper<v0_4_0_alpha_16::Version>), // VERSION_BUMP
+    V0_4_0_alpha_16(Wrapper<v0_4_0_alpha_16::Version>),
+    V0_4_0_alpha_17(Wrapper<v0_4_0_alpha_17::Version>), // VERSION_BUMP
     Other(exver::Version),
 }
 
@@ -234,7 +236,8 @@ impl Version {
             Self::V0_4_0_alpha_13(v) => DynVersion(Box::new(v.0)),
             Self::V0_4_0_alpha_14(v) => DynVersion(Box::new(v.0)),
             Self::V0_4_0_alpha_15(v) => DynVersion(Box::new(v.0)),
-            Self::V0_4_0_alpha_16(v) => DynVersion(Box::new(v.0)), // VERSION_BUMP
+            Self::V0_4_0_alpha_16(v) => DynVersion(Box::new(v.0)),
+            Self::V0_4_0_alpha_17(v) => DynVersion(Box::new(v.0)), // VERSION_BUMP
             Self::Other(v) => {
                 return Err(Error::new(
                     eyre!("unknown version {v}"),
@@ -285,7 +288,8 @@ impl Version {
             Version::V0_4_0_alpha_13(Wrapper(x)) => x.semver(),
             Version::V0_4_0_alpha_14(Wrapper(x)) => x.semver(),
             Version::V0_4_0_alpha_15(Wrapper(x)) => x.semver(),
-            Version::V0_4_0_alpha_16(Wrapper(x)) => x.semver(), // VERSION_BUMP
+            Version::V0_4_0_alpha_16(Wrapper(x)) => x.semver(),
+            Version::V0_4_0_alpha_17(Wrapper(x)) => x.semver(), // VERSION_BUMP
             Version::Other(x) => x.clone(),
         }
     }

core/src/version/v0_3_6_alpha_0.rs

@@ -286,6 +286,18 @@ impl VersionT for Version {
                 ErrorKind::Filesystem,
             ));
         }
+
+        if tokio::fs::metadata("/media/startos/data/package-data/volumes/nostr")
+            .await
+            .is_ok()
+        {
+            tokio::fs::rename(
+                "/media/startos/data/package-data/volumes/nostr",
+                "/media/startos/data/package-data/volumes/nostr-rs-relay",
+            )
+            .await?;
+        }
+
         // Should be the name of the package
         let mut paths = tokio::fs::read_dir(path).await?;
         while let Some(path) = paths.next_entry().await? {

core/src/version/v0_4_0_alpha_17.rs

@@ -0,0 +1,53 @@
+use exver::{PreReleaseSegment, VersionRange};
+
+use super::v0_3_5::V0_3_0_COMPAT;
+use super::{VersionT, v0_4_0_alpha_16};
+use crate::db::model::public::AcmeSettings;
+use crate::net::acme::AcmeProvider;
+use crate::prelude::*;
+
+lazy_static::lazy_static! {
+    static ref V0_4_0_alpha_17: exver::Version = exver::Version::new(
+        [0, 4, 0],
+        [PreReleaseSegment::String("alpha".into()), 17.into()]
+    );
+}
+
+#[derive(Clone, Copy, Debug, Default)]
+pub struct Version;
+
+impl VersionT for Version {
+    type Previous = v0_4_0_alpha_16::Version;
+    type PreUpRes = ();
+
+    async fn pre_up(self) -> Result<Self::PreUpRes, Error> {
+        Ok(())
+    }
+    fn semver(self) -> exver::Version {
+        V0_4_0_alpha_17.clone()
+    }
+    fn compat(self) -> &'static VersionRange {
+        &V0_3_0_COMPAT
+    }
+    #[instrument(skip_all)]
+    fn up(self, db: &mut Value, _: Self::PreUpRes) -> Result<Value, Error> {
+        let acme = db["public"]["serverInfo"]["network"]["acme"]
+            .as_object_mut()
+            .or_not_found("public.serverInfo.network.acme")?;
+        let letsencrypt =
+            InternedString::intern::<&str>("letsencrypt".parse::<AcmeProvider>()?.as_ref());
+        if !acme.contains_key(&letsencrypt) {
+            acme.insert(
+                letsencrypt,
+                to_value(&AcmeSettings {
+                    contact: Vec::new(),
+                })?,
+            );
+        }
+
+        Ok(Value::Null)
+    }
+    fn down(self, _db: &mut Value) -> Result<(), Error> {
+        Ok(())
+    }
+}