From 508eddc78458cd7ff51259ed733fe8e6f206e293 Mon Sep 17 00:00:00 2001
From: Lucas Fernandes Nogueira <lucasfernandesnog@gmail.com>
Date: Wed, 21 Apr 2021 21:44:18 -0300
Subject: [PATCH] refactor(core): plugin initialization return value (#1575)

---
 .changes/plugin-initialization-result.md | 5 +++++
 core/tauri/src/error.rs                  | 3 +++
 core/tauri/src/plugin.rs                 | 9 +++++++--
 3 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 .changes/plugin-initialization-result.md

diff --git a/.changes/plugin-initialization-result.md b/.changes/plugin-initialization-result.md
new file mode 100644
index 000000000..8ed9e6034
--- /dev/null
+++ b/.changes/plugin-initialization-result.md
@@ -0,0 +1,5 @@
+---
+"tauri": patch
+---
+
+Change plugin trait `initialization` return type to `std::result::Result<(), Box<dyn std::error::Error>>`.
diff --git a/core/tauri/src/error.rs b/core/tauri/src/error.rs
index 6e4666673..7505e58d2 100644
--- a/core/tauri/src/error.rs
+++ b/core/tauri/src/error.rs
@@ -57,6 +57,9 @@ pub enum Error {
   #[cfg(feature = "updater")]
   #[error("Updater: {0}")]
   TauriUpdater(#[from] crate::updater::Error),
+  /// Error initializing plugin.
+  #[error("failed to initialize plugin `{0}`: {1}")]
+  PluginInitialization(String, String),
 }
 
 impl From<serde_json::Error> for Error {
diff --git a/core/tauri/src/plugin.rs b/core/tauri/src/plugin.rs
index be0bba8b3..dda999fd4 100644
--- a/core/tauri/src/plugin.rs
+++ b/core/tauri/src/plugin.rs
@@ -12,6 +12,9 @@ use crate::{
 use serde_json::Value as JsonValue;
 use std::collections::HashMap;
 
+/// The plugin result type.
+pub type Result<T> = std::result::Result<T, Box<dyn std::error::Error>>;
+
 /// The plugin interface.
 pub trait Plugin<M: Params>: Send {
   /// The plugin name. Used as key on the plugin config object.
@@ -19,7 +22,7 @@ pub trait Plugin<M: Params>: Send {
 
   /// Initialize the plugin.
   #[allow(unused_variables)]
-  fn initialize(&mut self, config: JsonValue) -> crate::Result<()> {
+  fn initialize(&mut self, config: JsonValue) -> Result<()> {
     Ok(())
   }
 
@@ -69,7 +72,9 @@ impl<M: Params> PluginStore<M> {
   /// Initializes all plugins in the store.
   pub(crate) fn initialize(&mut self, config: &PluginConfig) -> crate::Result<()> {
     self.store.values_mut().try_for_each(|plugin| {
-      plugin.initialize(config.0.get(plugin.name()).cloned().unwrap_or_default())
+      plugin
+        .initialize(config.0.get(plugin.name()).cloned().unwrap_or_default())
+        .map_err(|e| crate::Error::PluginInitialization(plugin.name().to_string(), e.to_string()))
     })
   }