Merge pull request #15 from bytesonus/develop

0.1.3-3-beta

Author: rakshith-ravi

Cargo.toml

@@ -2,7 +2,7 @@
 authors = ["Rakshith Ravi <[email protected]>"]
 edition = "2018"
 name = "juno"
-version = "0.1.3-2"
+version = "0.1.3-3"
 license = "MIT"
 description = "A helper rust library for the juno microservices framework"
 homepage = "https://github.com/bytesonus/juno-rust"

src/juno_module.rs

@@ -260,7 +260,7 @@ async fn on_data_listener(
 				}
 				Ok(Value::Null)
 			}
-			BaseMessage::TriggerHookRequest { .. } => {
+			BaseMessage::TriggerHookResponse { .. } => {
 				execute_hook_triggered(message, &registered_store, &hook_listeners).await
 			}
 			BaseMessage::Error { error, .. } => Err(Error::FromJuno(error)),
@@ -300,19 +300,24 @@ async fn execute_hook_triggered(
 	registered_store: &Arc<RwLock<bool>>,
 	hook_listeners: &ArcHookListenerList,
 ) -> Result<Value> {
-	if let BaseMessage::TriggerHookRequest { hook, .. } = message {
-		if &hook == "juno.activated" {
-			*registered_store.write().unwrap() = true;
-		} else if &hook == "juno.deactivated" {
-			*registered_store.write().unwrap() = false;
-		} else {
-			let hook_listeners = hook_listeners.lock().await;
-			if !hook_listeners.contains_key(&hook) {
-				todo!("Wtf do I do now? Need to propogate errors. How do I do that?");
-			}
-			for listener in &hook_listeners[&hook] {
-				listener(Value::Null);
+	if let BaseMessage::TriggerHookResponse { hook, .. } = message {
+		if hook.is_some() {
+			let hook = hook.unwrap();
+			if hook == "juno.activated" {
+				*registered_store.write().unwrap() = true;
+			} else if &hook == "juno.deactivated" {
+				*registered_store.write().unwrap() = false;
+			} else {
+				let hook_listeners = hook_listeners.lock().await;
+				if !hook_listeners.contains_key(&hook) {
+					todo!("Wtf do I do now? Need to propogate errors. How do I do that?");
+				}
+				for listener in &hook_listeners[&hook] {
+					listener(Value::Null);
+				}
 			}
+		} else {
+			// This module triggered the hook.
 		}
 	} else {
 		panic!("Cannot execute hook from a request that wasn't a TriggerHookRequest!");

src/models/messages.rs

@@ -33,6 +33,7 @@ pub enum BaseMessage {
 	},
 	TriggerHookResponse {
 		request_id: String,
+		hook: Option<String>,
 	},
 	DeclareFunctionRequest {
 		request_id: String,

src/protocol/json_protocol.rs

@@ -82,9 +82,10 @@ pub fn encode(protocol: &BaseProtocol, req: BaseMessage) -> Buffer {
 					request_keys::HOOK: hook,
 				}),
 
-				BaseMessage::TriggerHookResponse { request_id } => json!({
+				BaseMessage::TriggerHookResponse { request_id, hook } => json!({
 					request_keys::REQUEST_ID: request_id,
 					request_keys::TYPE: request_types::TRIGGER_HOOK_RESPONSE,
+					request_keys::HOOK: hook
 				}),
 
 				BaseMessage::DeclareFunctionRequest {
@@ -210,8 +211,12 @@ fn decode_internal(data: &[u8]) -> Option<BaseMessage> {
 		Some(BaseMessage::TriggerHookRequest { request_id, hook })
 	} else if r#type == 8 {
 		let request_id = result[request_keys::REQUEST_ID].as_str()?.to_string();
+		let hook = match result[request_keys::HOOK].as_str() {
+			Some(string) => Some(string.to_string()),
+			None => None,
+		};
 
-		Some(BaseMessage::TriggerHookResponse { request_id })
+		Some(BaseMessage::TriggerHookResponse { request_id, hook })
 	} else if r#type == 9 {
 		let request_id = result[request_keys::REQUEST_ID].as_str()?.to_string();
 		let function = result[request_keys::FUNCTION].as_str()?.to_string();

tests/models/messages.rs

@@ -35,6 +35,7 @@ fn check_types_are_storing_values() {
 		},
 		BaseMessage::TriggerHookResponse {
 			request_id: String::from("request_id"),
+			hook: Some(String::from("hook")),
 		},
 		BaseMessage::DeclareFunctionRequest {
 			request_id: String::from("request_id"),
@@ -93,8 +94,9 @@ fn check_types_are_storing_values() {
 				assert_eq!(request_id, &String::from("request_id"));
 				assert_eq!(hook, &String::from("hook"));
 			}
-			BaseMessage::TriggerHookResponse { request_id } => {
+			BaseMessage::TriggerHookResponse { request_id, hook } => {
 				assert_eq!(request_id, &String::from("request_id"));
+				assert_eq!(hook, &Some(String::from("hook")));
 			}
 			BaseMessage::DeclareFunctionRequest {
 				request_id,