revision

Author: musicman3

src/eMarket/model/eMarket/Core/JsonRpc.php

@@ -30,14 +30,6 @@ class JsonRpc {
     private $methods_available = [];
     public static $response = [];
 
-    /**
-     * Constructor
-     *
-     */
-    public function __construct() {
-        
-    }
-
     /**
      * Return jsonRpc data from key name
      * 

src/eMarket/model/eMarket/JsonRpc/ChatGPT.php

@@ -76,12 +76,14 @@ private function request(): void {
                         'temperature' => 0.7
             ];
 
-            echo $this->curl($request,
+            $output = json_decode($this->curl($request,
                     'https://api.openai.com/v1/chat/completions',
                     ['Content-Type: application/json',
                         'Accept: application/json',
                         'User-Agent: eMarket',
-                        'Authorization: Bearer ' . $this->token]);
+                        'Authorization: Bearer ' . $this->token]));
+            
+            $this->responseBuilder([$output], $this->jsonrpc['id']);
         }
     }
 
@@ -100,8 +102,8 @@ private function apiKey(): void {
                     ->set('my_data', $chatgpt_token)
                     ->where('login=', $decrypt_login)
                     ->save();
-
-            echo json_encode([lang('chatgpt_api_key_saved')]);
+            
+            $this->responseBuilder([lang('chatgpt_api_key_saved')], $this->jsonrpc['id']);
         }
     }
 }

src/eMarket/model/library/js/classes/chatgpt/chatgpt.js

@@ -2,7 +2,7 @@
  |    GNU GENERAL PUBLIC LICENSE v.3.0    |
  |  https://github.com/musicman3/eMarket  |
  =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= */
-/* global Ajax, Randomizer */
+/* global Ajax, Randomizer, JsonRpc */
 
 /**
  * ChatGPT
@@ -29,6 +29,7 @@ class ChatGPT {
     static request(content = 'Say this is a test!') {
 
         var randomizer = new Randomizer();
+        sessionStorage.setItem('ChatGPT.request.id', randomizer.uid(32));
 
         var jsonRpcRequest = [
             {
@@ -38,7 +39,7 @@ class ChatGPT {
                     'message': content,
                     'login': document.querySelector('#user_login').dataset.login
                 },
-                'id': randomizer.uid(32)
+                'id': sessionStorage.getItem('ChatGPT.request.id')
             }
         ];
 
@@ -59,6 +60,7 @@ class ChatGPT {
     static apiKey(content = '') {
 
         var randomizer = new Randomizer();
+        sessionStorage.setItem('ChatGPT.apiKey.id', randomizer.uid(32));
 
         var jsonRpcRequest = [
             {
@@ -68,7 +70,7 @@ class ChatGPT {
                     'api_key': content,
                     'login': document.querySelector('#user_login').dataset.login
                 },
-                'id': randomizer.uid(32)
+                'id': sessionStorage.getItem('ChatGPT.apiKey.id')
             }
         ];
 
@@ -84,9 +86,14 @@ class ChatGPT {
      * @param data {String} (data)
      */
     static save(data) {
-        var input = JSON.parse(data);
-        document.querySelector('#chat_bot').value = input[0];
-        document.querySelector('#chatgpt_key').value = '';
+        if (data !== null && data !== undefined) {
+
+            var input = JSON.parse(data);
+            input = JsonRpc.jsonRpcSelect(input, sessionStorage.getItem('ChatGPT.apiKey.id'));
+
+            document.querySelector('#chat_bot').value = input.result[0];
+            document.querySelector('#chatgpt_key').value = '';
+        }
     }
 
     /**
@@ -138,15 +145,20 @@ class ChatGPT {
      * @param data {Object} (ChatGPT response)
      */
     static Response(data) {
-        var input = JSON.parse(data);
-        if (input !== undefined && input.choices !== undefined) {
-            document.querySelector('#chat_bot').value = input.choices[0].message.content;
-            document.querySelector('#chat_user').disabled = false;
-            document.querySelector('#chat_user').value = '';
-            document.querySelector('#chat_user').focus();
-        } else {
-            document.querySelector('#chat_bot').value = input.error.message;
+        if (data !== null && data !== undefined) {
+
+            var input = JSON.parse(data);
+            input = JsonRpc.jsonRpcSelect(input, sessionStorage.getItem('ChatGPT.request.id'));
+            
+            if (input !== undefined && input.choices !== undefined) {
+                document.querySelector('#chat_bot').value = input.result.choices[0].message.content;
+                document.querySelector('#chat_user').disabled = false;
+                document.querySelector('#chat_user').value = '';
+                document.querySelector('#chat_user').focus();
+            } else {
+                document.querySelector('#chat_bot').value = input.result[0].error.message;
+            }
+            ChatGPT.removeClass();
         }
-        ChatGPT.removeClass();
     }
 }