Merge pull request #853 from gofractally/mm/chainmail-rename-from-web…

…mail

Renaming Webmail to Chainmail

rust/psibase/src/services/webmail.rs → rust/psibase/src/services/chainmail.rs

@@ -1,4 +1,4 @@
-#[crate::service(name = "webmail", dispatch = false, psibase_mod = "crate")]
+#[crate::service(name = "chainmail", dispatch = false, psibase_mod = "crate")]
 #[allow(non_snake_case, unused_variables)]
 mod service {
     use crate::{http::HttpRequest, AccountNumber, Hex};

rust/psibase/src/services/mod.rs

@@ -3,6 +3,7 @@
 pub mod accounts;
 pub mod auth_delegate;
 pub mod auth_sig;
+pub mod chainmail;
 pub mod common_api;
 pub mod cpu_limit;
 pub mod events;
@@ -18,4 +19,3 @@ pub mod setcode;
 pub mod sites;
 pub mod tokens;
 pub mod transact;
-pub mod webmail;

services/user/Branding/ui/src/App.tsx

@@ -20,7 +20,7 @@ export const App = () => {
     const init = async () => {
         await supervisor.onLoaded();
         supervisor.preLoadPlugins([{ service: "branding" }]);
-        await getNetworkName();
+        setTimeout(getNetworkName, 1500);
     };
 
     useEffect(() => {

services/user/Webmail/Cargo.toml → services/user/Chainmail/Cargo.toml

@@ -11,7 +11,7 @@ homepage = "https://psibase.io"
 publish = false
 
 [package]
-name = "webmail_package"
+name = "chainmail_package"
 
 [profile.release]
 codegen-units = 1
@@ -21,13 +21,13 @@ strip = true
 lto = true
 
 [package.metadata.psibase]
-package-name = "Webmail"
+package-name = "Chainmail"
 description = "Basic email app"
-services = ["webmail"]
+services = ["chainmail"]
 
 [lib]
 crate-type = ["rlib"]
 
 [dependencies]
-webmail = { path = "service" }
+chainmail = { path = "service" }
 plugin = { path = "plugin" }

services/user/Webmail/include/services/user/Webmail.hpp → services/user/Chainmail/include/services/user/Webmail.hpp

@@ -6,14 +6,14 @@
 
 namespace UserService
 {
-   class Webmail : public psibase::Service<Webmail>
+   class Chainmail : public psibase::Service<Chainmail>
    {
      public:
       using Tables = psibase::ServiceTables<InitTable, psibase::WebContentTable>;
 
-      static constexpr auto service = psibase::AccountNumber("webmail");
+      static constexpr auto service = psibase::AccountNumber("chainmail");
 
-      Webmail(psio::shared_view_ptr<psibase::Action> action);
+      Chainmail(psio::shared_view_ptr<psibase::Action> action);
 
       void init();
 
@@ -38,18 +38,18 @@ namespace UserService
    };
 
    // clang-format off
-   PSIO_REFLECT(Webmail,
+   PSIO_REFLECT(Chainmail,
       method(init),
       method(send, receiver, subject, body),
       method(serveSys, request),
       method(storeSys, path, contentType, content)
    );
-   PSIBASE_REFLECT_EVENTS(Webmail);
-   PSIBASE_REFLECT_HISTORY_EVENTS(Webmail,
+   PSIBASE_REFLECT_EVENTS(Chainmail);
+   PSIBASE_REFLECT_HISTORY_EVENTS(Chainmail,
       method(sent, sender, receiver, subject, body),
    );
-   PSIBASE_REFLECT_UI_EVENTS(Webmail);
-   PSIBASE_REFLECT_MERKLE_EVENTS(Webmail);
+   PSIBASE_REFLECT_UI_EVENTS(Chainmail);
+   PSIBASE_REFLECT_MERKLE_EVENTS(Chainmail);
    // clang-format on
 
 }  // namespace UserService

services/user/Webmail/plugin/Cargo.toml → services/user/Chainmail/plugin/Cargo.toml

@@ -10,13 +10,13 @@ publish = false
 [dependencies]
 wit-bindgen-rt = { version = "0.28.0", features = ["bitflags"] }
 psibase = { path = "../../../../rust/psibase/" }
-webmail = { path = "../service/" }
+chainmail = { path = "../service/" }
 
 [lib]
 crate-type = ["cdylib"]
 
 [package.metadata.component]
-package = "webmail:plugin"
+package = "chainmail:plugin"
 
 [package.metadata.component.target]
 world = "impl"
@@ -26,4 +26,4 @@ world = "impl"
 "transact:plugin" = { path = "../../../system/Transact/plugin/wit/world.wit" }
 
 [dev-dependencies]
-webmail_package = { path = ".." }
+chainmail_package = { path = ".." }

services/user/Webmail/plugin/src/lib.rs → services/user/Chainmail/plugin/src/lib.rs

@@ -1,19 +1,19 @@
 #[allow(warnings)]
 mod bindings;
 
-use bindings::exports::webmail::plugin::api::{Error, Guest as API};
+use bindings::exports::chainmail::plugin::api::{Error, Guest as API};
 use bindings::transact::plugin::intf as Transact;
 use psibase::fracpack::Pack;
-use psibase::services::webmail;
+use psibase::services::chainmail;
 use psibase::AccountNumber;
 
-struct WebmailPlugin;
+struct ChainmailPlugin;
 
-impl API for WebmailPlugin {
+impl API for ChainmailPlugin {
     fn send(receiver: String, subject: String, body: String) -> Result<(), Error> {
         Transact::add_action_to_transaction(
             "send",
-            &webmail::action_structs::send {
+            &chainmail::action_structs::send {
                 receiver: AccountNumber::from(receiver.as_str()),
                 subject,
                 body,
@@ -24,4 +24,4 @@ impl API for WebmailPlugin {
     }
 }
 
-bindings::export!(WebmailPlugin with_types_in bindings);
+bindings::export!(ChainmailPlugin with_types_in bindings);

services/user/Webmail/plugin/wit/impl.wit → services/user/Chainmail/plugin/wit/impl.wit

@@ -1,4 +1,4 @@
-package webmail:plugin;
+package chainmail:plugin;
 
 world impl {
     include host:common/imports;

services/user/Webmail/plugin/wit/world.wit → services/user/Chainmail/plugin/wit/world.wit

@@ -1,4 +1,4 @@
-package webmail:plugin;
+package chainmail:plugin;
 
 interface api {
     use host:common/types.{error};

services/user/Webmail/service/Cargo.toml → services/user/Chainmail/service/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "webmail"
+name = "chainmail"
 version.workspace = true
 rust-version.workspace = true
 repository.workspace = true
@@ -8,7 +8,7 @@ edition.workspace = true
 publish = false
 
 [package.metadata.psibase]
-server = "webmail"
+server = "chainmail"
 plugin = "plugin"
 
 [dependencies]
@@ -17,4 +17,4 @@ async-graphql = "7.0.7"
 serde = { version = "1.0.209", features = ["derive"] }
 
 [dev-dependencies]
-webmail_package = { path = ".." }
+chainmail_package = { path = ".." }

services/user/Webmail/service/src/lib.rs → services/user/Chainmail/service/src/lib.rs

@@ -88,7 +88,7 @@ fn serve_rest_api(request: &HttpRequest) -> Option<HttpReply> {
         let mq = make_query(
             request,
             format!(
-                "SELECT * FROM \"history.webmail.sent\" {} ORDER BY ROWID",
+                "SELECT * FROM \"history.chainmail.sent\" {} ORDER BY ROWID",
                 where_clause
             ),
         );

services/user/Chainmail/src/lib.rs

@@ -0,0 +1,2 @@
+pub use chainmail;
+pub use plugin;

services/user/Webmail/ui/package.json → services/user/Chainmail/ui/package.json

@@ -1,5 +1,5 @@
 {
-    "name": "webmail",
+    "name": "chainmail",
     "private": true,
     "version": "0.0.0",
     "type": "module",

services/user/Webmail/ui/src/components/compose-dialog.tsx → services/user/Chainmail/ui/src/components/compose-dialog.tsx

@@ -125,7 +125,7 @@ export const ComposeDialog = ({
             const supervisor = await getSupervisor();
             // TODO: Improve error detection. This promise resolves with success before the transaction is pushed.
             await supervisor.functionCall({
-                service: "webmail",
+                service: "chainmail",
                 intf: "api",
                 method: "send",
                 params: [draft.to, draft.subject, draft.body],

services/user/Webmail/ui/vite.config.ts → services/user/Chainmail/ui/vite.config.ts

@@ -132,7 +132,7 @@ const psibase = (service: string, isServing?: boolean) => {
 export default defineConfig(({ command }) => ({
     plugins: [
         react(),
-        psibase("webmail", command === "serve"),
+        psibase("chainmail", command === "serve"),
         wasm(),
         topLevelAwait(),
         tsconfigPaths(),

services/user/Homepage/ui/src/App.tsx

@@ -19,7 +19,7 @@ const App = () => {
                 <AppItem
                     name="Chain mail"
                     description="Send mail between accounts."
-                    service="webmail"
+                    service="chainmail"
                 />
                 <AppItem
                     name="Doc"

services/user/Homepage/ui/src/pages/Dashboard.tsx

@@ -16,7 +16,7 @@ const App = () => {
             <AppItem
                 name="Chain mail"
                 description="Send mail between accounts."
-                service="webmail"
+                service="chainmail"
             />
             <AppItem
                 name="Doc"