Fixed bugs

Author: Miljan9602

.idea/inspectionProfiles/profiles_settings.xml

@@ -25,10 +25,10 @@ class Client{
     public function __construct($options){
         $this->options = $options;
 
-        $this->messageRouter = new TaskMessageRouter();
-        
+        $this->messageRouter = TaskMessageRouter::getTaskMessageRouter();
+
         if($this->options["store"]["type"] == "mysql"){
-            $this->taskStore = new MySQLTaskStore($client);
+            $this->taskStore = new MySQLTaskStore($this);
         } else {
             throw new Exception("Invalid Store choice. ");
         }

.idea/misc.xml

@@ -10,13 +10,24 @@
 
 
 class HTTPClientTask extends Task{
+
+    private $client;
+    private $name;
+
+    public function __construct($client, $name)
+    {
+        $this->client = $client;
+        $this->name = $name;
+    }
+
+
     public function sendTask(){
         $url = $this->client->getSetting("api_base")."/task";
         $payload = $this->getTask();
 
         $taskResponse = $this->sendRequest($url, $payload);
 
-        $client->getTaskStore()->setTask($taskResponse["taskID"], $task->getTask());
+        $this->client->getTaskStore()->setTask($taskResponse["taskID"], $this->getTask());
         return $taskResponse;
     }
 

.idea/modules.xml

@@ -20,7 +20,7 @@ public function __construct($client){
     }
 
     public function getTask($taskID){
-        $result = mysqli_query($link, "SELECT `task` FROM `tasks` WHERE `taskID` = ".intval($taskID));
+        $result = mysqli_query($this->connection, "SELECT `task` FROM `tasks` WHERE `taskID` = ".intval($taskID));
 
         if(mysqli_num_rows($result) === 0){
             throw new Exception("Task $taskID not found.");
@@ -30,6 +30,6 @@ public function getTask($taskID){
     }
 
     public function setTask($taskID, $task){
-        $result = mysqli_query($link, "INSERT INTO `tasks` (`taskID`, `task`) VALUES (".intval($taskID).", '".mysqli_real_escape_string($this->link, json_encode($task->getTask()))."')");
+        $result = mysqli_query($this->connection, "INSERT INTO `tasks` (`taskID`, `task`) VALUES (".intval($taskID).", '".mysqli_real_escape_string($this->link, json_encode($task->getTask()))."')");
     }
  }

.idea/workerjs-phpclient.iml

@@ -41,7 +41,7 @@ public function setParams($body){
 
     abstract public function sendTask();
 
-    abstract public function sendMessage();
+    abstract public function sendMessage($payload);
 
     private function preProcessParams(){
         //Optional override

.idea/workspace.xml

@@ -11,19 +11,18 @@
 class TaskRequestHandler{
     private $client;
 
-    public function __construct($client){
+    public function __construct(Client $client){
         $this->client = $client;
     }
 
-    public static function handleRequest(string $body){
+    public function handleRequest(string $body){
         $body = json_decode($body, true);
 
         //TODO: Check protocol
 
         $taskID = $body->taskID;
 
-        $taskStoreClass = $this->client->getSetting("taskStoreClass");
-        $taskStore = new $taskStoreClass();
+        $taskStore = $this->client->getTaskStore();
 
         $task = $taskStore->getTask($taskID);
 
@@ -32,7 +31,7 @@ public static function handleRequest(string $body){
         $handlerName = $task->getHandlerName();
 
         try {
-            $this->client->getTaskMessageRouter()->call($handlerName, $task, $params);
+            $this->client->getTaskMessageRouter()->call($handlerName, $task, $body);
         } catch(Exception $e){
             //TODO: Log unimplemented handler
         }