Ajmo se pomoliti

Author: nemanjan00

src/WorkerJS/PHPClient/HTTPClientTask.php

@@ -16,6 +16,7 @@ class HTTPClientTask extends Task{
 
     public function __construct($client, $name)
     {
+        parent::__construct($client, $name);
         $this->client = $client;
         $this->name = $name;
     }
@@ -27,16 +28,18 @@ public function sendTask(){
 
         $taskResponse = $this->sendRequest($url, $payload);
 
-        $this->client->getTaskStore()->setTask($taskResponse["taskID"], $this->getTask());
+        $this->client->getTaskStore()->setTask($taskResponse["taskID"], $this);
         return $taskResponse;
     }
 
     public function sendMessage($payload){
         $url = $this->client->getSetting("api_base")."/message";
+        $request = [
+            "taskID" =>  $this->task["taskID"],
+            "message" => $payload,
+        ];
 
-        $payload->taskID = $this->task->taskID;
-
-        return $this->sendRequest($url, $payload);
+        return $this->sendRequest($url, $request);
     }
 
     public function preProcess(){
@@ -49,7 +52,7 @@ private function sendRequest($url, $payload){
         curl_setopt($ch, CURLOPT_URL, $url);
         curl_setopt($ch, CURLOPT_POST, true);
         curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($payload));
-        curl_setopt($ch, CURLOPT_HTTPHEADER, array('Content-Type:application/json'));
+        curl_setopt($ch, CURLOPT_HTTPHEADER, array('Content-Type: application/json'));
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
 
         $result = curl_exec($ch);

src/WorkerJS/PHPClient/MySQLTaskStore.php

@@ -25,7 +25,8 @@ public function getTask($taskID){
         if(mysqli_num_rows($result) === 0){
             throw new \Exception("Task $taskID not found.");
         } else {
-            return mysqli_fetch_assoc($result);
+            $task = mysqli_fetch_assoc($result)["task"];
+            return json_decode($task);
         }
     }
 

src/WorkerJS/PHPClient/PostgresTaskStore.php

@@ -21,16 +21,18 @@ public function __construct($client){
     }
 
     public function getTask($taskID){
-        $result = pg_query($this->connection, "SELECT task FROM tasks WHERE \"taskID\" = ".intval($taskID));
+        $result = pg_query($this->connection, "SELECT task FROM tasks WHERE \"taskID\" = '".pg_escape_string($this->connection, $taskID)."'");
 
         if(pg_num_rows($result) === 0){
             throw new \Exception("Task $taskID not found.");
         } else {
-            return pg_fetch_assoc($result);
+            $task = pg_fetch_assoc($result)["task"];
+
+            return json_decode($task, true);
         }
     }
 
     public function setTask($taskID, Task $task){
-        pg_query($this->connection, "INSERT INTO tasks (\"taskID\", task) VALUES (".intval($taskID).", '".pg_escape_string($this->connection, json_encode($task->getTask()))."')");
+        pg_query($this->connection, "INSERT INTO tasks (\"taskID\", task) VALUES ('".pg_escape_string($this->connection, $taskID)."', '".pg_escape_string($this->connection, json_encode($task->getTask()))."')");
     }
  }

src/WorkerJS/PHPClient/Task.php

@@ -10,13 +10,12 @@
 
 abstract class Task
 {
-    private $name;
     private $client;
     protected $task;
 
     public function __construct($client, $params)
     {
-        if($params instanceof string) {
+        if( is_string($params) ) {
             $name = $params;
             $this->task = [
                 "name" => null,
@@ -48,6 +47,6 @@ private function preProcessParams(){
     }
 
     public function getHandlerName() {
-        return $this->name;
+        return $this->task["name"];
     }
 }

src/WorkerJS/PHPClient/TaskMessageRequestHandler.php

@@ -17,18 +17,18 @@ public function __construct(Client $client){
 
     public function handleRequest(string $body){
         $body = json_decode($body);
-
         //TODO: Check protocol
 
         $taskID = $body->taskID;
 
         $taskStore = $this->client->getTaskStore();
 
         $task = $taskStore->getTask($taskID);
+        $task["taskID"] = $taskID;
 
         $task = $this->client->newTask($task);
 
-        $handlerName = $task->getHandlerName();
+        $handlerName = $body->name;
 
         try {
             $this->client->getTaskMessageRouter()->call($handlerName, $task, $body);

src/WorkerJS/PHPClient/TaskMessageRouter.php

@@ -41,7 +41,7 @@ private static function getHandlerByName($name)
         if(isset($taskMessageRouter->handlers[$name])) {
             return $taskMessageRouter->handlers[$name];
         } else {
-            throw \Exception("Handler for $name is not registered. ");
+            throw new \Exception("Handler for $name is not registered. ");
         }
     }
 

src/example.php

@@ -18,11 +18,12 @@
 use \WorkerJS\PHPClient;
 
 $client = new PHPClient\Client([]);
+$taskMessageRequestHandler = new PHPClient\TaskMessageRequestHandler($client);
 
 // Message receiver
 
 $router->get("/webhook", function($request, $response){
-	$taskMessageRequestHandler = new PHPClient\TaskMessageRequestHandler($client);
+    global $taskMessageRequestHandler;
 
     $taskMessageRequestHandler->handleRequest($request->body);
 });
@@ -53,4 +54,3 @@ public function handle(\WorkerJS\PHPClient\Task $task, $params)
 ]);
 
 $task->sendTask();
-