Implemented errback chain

Author: Dragon-Developer

GM Netcode.resource_order

@@ -1,21 +1,22 @@
 {
   "FolderOrderSettings": [
-    {"name":"Classes","order":2,"path":"folders/Scripts/Netcode/Classes.yy",},
-    {"name":"TCP","order":4,"path":"folders/Scripts/Netcode/TCP.yy",},
-    {"name":"WebSocket","order":5,"path":"folders/Scripts/Netcode/WebSocket.yy",},
+    {"name":"Classes","order":3,"path":"folders/Scripts/Netcode/Classes.yy",},
+    {"name":"WebSocket","order":1,"path":"folders/Scripts/Netcode/Protocol/WebSocket.yy",},
+    {"name":"RPC","order":2,"path":"folders/Scripts/Netcode/RPC.yy",},
+    {"name":"Protocol","order":6,"path":"folders/Scripts/Netcode/Protocol.yy",},
   ],
   "ResourceOrderSettings": [
     {"name":"Socket","order":4,"path":"scripts/Socket/Socket.yy",},
     {"name":"Client","order":2,"path":"scripts/Client/Client.yy",},
     {"name":"obj_client","order":1,"path":"objects/obj_client/obj_client.yy",},
     {"name":"obj_client_status","order":3,"path":"objects/obj_client_status/obj_client_status.yy",},
-    {"name":"RPC","order":1,"path":"scripts/RPC/RPC.yy",},
     {"name":"obj_controller","order":1,"path":"objects/obj_controller/obj_controller.yy",},
     {"name":"Server","order":3,"path":"scripts/Server/Server.yy",},
     {"name":"WebSocket","order":1,"path":"scripts/WebSocket/WebSocket.yy",},
     {"name":"Manager","order":2,"path":"scripts/Manager/Manager.yy",},
     {"name":"TCPSocket","order":1,"path":"scripts/TCPSocket/TCPSocket.yy",},
     {"name":"GameClient","order":1,"path":"scripts/GameClient/GameClient.yy",},
+    {"name":"RPCRequest","order":1,"path":"scripts/RPCRequest/RPCRequest.yy",},
     {"name":"obj_server_status","order":2,"path":"objects/obj_server_status/obj_server_status.yy",},
   ],
 }

GM Netcode.yyp

@@ -35,24 +35,45 @@ function GameClient(_ip, _port) : TCPSocket(_ip, _port) constructor {
 			.onCallback(function(_result) {
 				show_debug_message(_result);	
 			});
-		// Example with chaining callbacks
-		rpc.sendRequest("sum", [1, 2])
+		// Example with callback chain
+		rpc.sendRequest("sum", [1, 5])
 			.onCallback(function(_result) {
-				return rpc.sendRequest("sum", [_result, 3])	
+				// Result is sum(1, 5) = 6, then request sum(6, 15)
+				return rpc.sendRequest("sum", [_result, 15])	
 			})
 			.onCallback(function(_result) {
+				// This callback isn't executed because the result was higher than 10 (error)
 				return rpc.sendRequest("sum", [_result, 4])	
 			})
 			.onCallback(function(_result) {
-				show_debug_message(_result); // 1 + 2 + 3 + 4 = 10
+				// This callback isn't executed because the previous one wasn't executed
+				show_debug_message(_result);
 			})
 			.onError(function(_error) {
+				// This is executed because sum(6, 16) resulted in an error
 				show_debug_message(_error.message);
+				return rpc.sendRequest("sum", [1, 2]);
+			})
+			.onCallback(function(_result) {
+				// Result is sum(1, 2) = 3, then request sum(3, 3)
+				return rpc.sendRequest("sum", [_result, 3])	
+			})
+			.onCallback(function(_result) {
+				// Result is sum(3, 3) = 6, then request sum(6, 4)
+				return rpc.sendRequest("sum", [_result, 5])	
+			})
+			.onCallback(function(_result) {
+				// Result is 10
+				show_debug_message(_result);
+			})
+			.onFinally(function() {
+				// Always execute this
+				show_debug_message("Finally");
 			});
 		sendPing();
 	});
 	static step = function() {
-		if (mouse_check_button_pressed(mb_left)) {
+		if (mouse_check_button(mb_left)) {
 			// Send notification to create ball
 			rpc.sendNotification("create_ball", {
 				x: mouse_x,

scripts/GameClient/GameClient.gml

@@ -137,63 +137,3 @@ function RPC(_socket) constructor {
 		return increment;
 	}
 }
-function RPCRequest(_id, _timeout, _parent) constructor {
-	self.requestID = _id;
-	self.parent = _parent;
-	self.callbacks = [];
-	self.errback = undefined;
-	self.finallyMethod = undefined;
-	static onCallback = function(_callback) {
-		array_push(self.callbacks, _callback);
-		return self;
-	}
-	static onError = function(_errback) {
-		self.errback = _errback;
-		return self;
-	}
-	static onFinally = function(_finally) {
-		self.finallyMethod = _finally;
-		return self;
-	}
-	static runCallback = function(_params) {
-		if (array_length(self.callbacks) > 0) {
-			var _callback = self.callbacks[0];
-			if (is_method(_callback)) {
-				var _callback_result = _callback(_params);
-				if (is_struct(_callback_result) && is_instanceof(_callback_result, RPCRequest)) {
-					array_delete(callbacks, 0, 1);
-					_callback_result.callbacks = callbacks;
-					_callback_result.onError(errback);
-					_callback_result.onFinally(finallyMethod);
-					return;
-				}
-			}
-		}
-		runFinally();	
-	}
-	static runErrback = function(_error) {
-		if (is_method(self.errback)) {
-			self.errback(_error);
-		}
-		self.runFinally();	
-	}
-	static runFinally = function() {
-		if (!is_method(finallyMethod)) return;
-		self.finallyMethod();
-	}
-	self.call = call_later(_timeout, time_source_units_seconds, function() {
-		var _requests = parent.requests;
-		if (!_requests.hasElement(requestID)) return;
-		var _request = _requests.getElement(requestID);
-		var _error = {
-			code: -32603,
-			message: "Timeout error"
-		};
-		_request.runErrback(_error);
-		_requests.removeElement(requestID);
-	});
-	static cancel = function() {
-		call_cancel(call);	
-	}
-}
-	

scripts/RPC/RPC.gml

@@ -0,0 +1,78 @@
+function RPCRequest(_id, _timeout, _parent) constructor {
+	self.requestID = _id;
+	self.parent = _parent;
+	self.callbacks = [[]];
+	self.errbacks = [];
+	self.finallyMethod = undefined;
+	self.errorLevel = 0;
+	self.runLevel = 0;
+	static onCallback = function(_callback) {
+		array_push(self.callbacks[self.errorLevel], _callback);
+		return self;
+	}
+	static onError = function(_errback) {
+		array_push(self.errbacks, _errback);
+		self.errorLevel += 1;
+		if (self.errorLevel >= array_length(self.callbacks)) { 
+			self.callbacks[self.errorLevel] = [];
+		}
+		return self;
+	}
+	static onFinally = function(_finally) {
+		self.finallyMethod = _finally;
+		return self;
+	}
+	static copy = function(_request) {
+		self.runLevel = _request.runLevel;
+		self.callbacks = _request.callbacks;
+		self.errbacks = _request.errbacks;
+		self.onFinally(_request.finallyMethod);
+	}
+	static runCallback = function(_params) {
+		if (runLevel < array_length(callbacks) && array_length(callbacks[runLevel]) > 0) {
+			var _callback_array = callbacks[runLevel];
+			var _callback = _callback_array[0];
+			if (is_method(_callback)) {
+				var _callback_result = _callback(_params);
+				if (is_struct(_callback_result) && is_instanceof(_callback_result, RPCRequest)) {
+					array_delete(_callback_array, 0, 1);
+					_callback_result.copy(self);
+					return;
+				}
+			}
+		}
+		self.runFinally();	
+	}
+	static runErrback = function(_error) {
+		if (runLevel < array_length(errbacks)) {
+			var _errback = errbacks[runLevel];
+			if (is_method(_errback)) {
+				var _error_result = _errback(_error);
+				if (is_struct(_error_result) && is_instanceof(_error_result, RPCRequest)) {
+					runLevel++;
+					_error_result.copy(self);
+					return;
+				}
+			}
+		}
+		self.runFinally();	
+	}
+	static runFinally = function() {
+		if (!is_method(finallyMethod)) return;
+		self.finallyMethod();
+	}
+	self.call = call_later(_timeout, time_source_units_seconds, function() {
+		var _requests = parent.requests;
+		if (!_requests.hasElement(requestID)) return;
+		var _request = _requests.getElement(requestID);
+		var _error = {
+			code: -32603,
+			message: "Timeout error"
+		};
+		_request.runErrback(_error);
+		_requests.removeElement(requestID);
+	});
+	static cancel = function() {
+		call_cancel(call);	
+	}
+}