[HOTFIX][FE]: Do not treat readyState 2 & 4 as an error (#133)

Nicklas373 · May 12, 2024 · 77ca96a · 77ca96a
2 parents a67c1f8 + 86e6a4a
commit 77ca96a
Show file tree

Hide file tree

Showing 8 changed files with 67 additions and 57 deletions.
diff --git a/README.md b/README.md
@@ -63,7 +63,7 @@ used of Flowbite library to maintain responsive and materialize interface. And p
 3. Configure Server Host
      ````bash
         - docker compose exec hana-api-services echo "TELEGRAM_BOT_ID=YOUR_TELEGRAM_BOT_ID" >> .env
-        - docker compose exec hana-api-services echo "TELEGRAM_TASK_ID=YOUR_TELEGRAM_CHANNEL_ID" >> .env
+        - docker compose exec hana-api-services echo "TELEGRAM_REPORT_ID=YOUR_TELEGRAM_CHANNEL_ID" >> .env
         - docker compose exec hana-api-services echo "TELEGRAM_CHAT_ID=YOUR_TELEGRAM_CHANNEL_ID" >> .env
         - docker compose exec hana-api-services echo "HANA_UNIQUE_TOKEN=YOUR_SHA512_UNIQUE_TOKEN" >> .env
         - docker compose exec hana-api-services sed -i "s/ASPOSE_CLOUD_CLIENT_ID=xxxx/ASPOSE_CLOUD_CLIENT_ID=YOUR_ASPOSE_CLOUD_CLIENT_ID/" >> .env

diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
@@ -62,12 +62,12 @@ public function render($request, Throwable $exception)
                     DB::table('appLogs')->insert([
                         'processId' => $uuid,
                         'errReason' => 'Method not allowed exception!',
-                        'errApiReason' => $message
+                        'errStatus' => $message
                     ]);
                     DB::table('accessLogs')->insert([
                         'processId' => $uuid,
                         'routePath' => $currentRouteInfo,
-                        'accessIpAddress' => true
+                        'accessIpAddress' => $userIp
                     ]);
                 } catch (QueryException $ex) {
                     Log::error('Query Exception failed with: '. $e->getMessage());
@@ -79,12 +79,12 @@ public function render($request, Throwable $exception)
                     DB::table('appLogs')->insert([
                         'processId' => $uuid,
                         'errReason' => 'Method not allowed exception!',
-                        'errApiReason' => $message
+                        'errStatus' => $message
                     ]);
                     DB::table('accessLogs')->insert([
                         'processId' => $uuid,
                         'routePath' => null,
-                        'accessIpAddress' => true
+                        'accessIpAddress' => $userIp
                     ]);
                 } catch (QueryException $ex) {
                     Log::error('Query Exception failed with: '. $e->getMessage());
@@ -98,12 +98,12 @@ public function render($request, Throwable $exception)
                 DB::table('appLogs')->insert([
                     'processId' => $uuid,
                     'errReason' => 'Token Mismatch exception!',
-                    'errApiReason' => $message
+                    'errStatus' => $message
                 ]);
                 DB::table('accessLogs')->insert([
                     'processId' => $uuid,
                     'routePath' => $currentRouteInfo,
-                    'accessIpAddress' => true
+                    'accessIpAddress' => $userIp
                 ]);
             } catch (QueryException $ex) {
                 Log::error('Query Exception failed with: '. $e->getMessage());
@@ -116,7 +116,7 @@ public function render($request, Throwable $exception)
                 DB::table('appLogs')->insert([
                     'processId' => $uuid,
                     'errReason' => 'Route not found exception!',
-                    'errApiReason' => $message
+                    'errStatus' => $message
                 ]);
                 DB::table('accessLogs')->insert([
                     'processId' => $uuid,
@@ -139,12 +139,12 @@ public function render($request, Throwable $exception)
                 DB::table('appLogs')->insert([
                     'processId' => $uuid,
                     'errReason' => '404 - Page not found',
-                    'errApiReason' => $message
+                    'errStatus' => $message
                 ]);
                DB::table('accessLogs')->insert([
                    'processId' => $uuid,
                    'routePath' => $currentRouteInfo,
-                   'accessIpAddress' => true
+                   'accessIpAddress' => $userIp
                ]);
            } catch (QueryException $ex) {
                Log::error('Query Exception failed with: '. $e->getMessage());
@@ -156,13 +156,13 @@ public function render($request, Throwable $exception)
                 DB::table('appLogs')->insert([
                     'processId' => $uuid,
                     'errReason' => '403 - Forbidden',
-                    'errApiReason' => $message
-                ]);
-                DB::table('accessLogs')->insert([
-                    'processId' => $uuid,
-                    'routePath' => $currentRouteInfo,
-                    'accessIpAddress' => true
+                    'errStatus' => $message
                 ]);
+               DB::table('accessLogs')->insert([
+                   'processId' => $uuid,
+                   'routePath' => $currentRouteInfo,
+                   'accessIpAddress' => $userIp
+               ]);
            } catch (QueryException $ex) {
                Log::error('Query Exception failed with: '. $e->getMessage());
            }
@@ -173,12 +173,12 @@ public function render($request, Throwable $exception)
                 DB::table('appLogs')->insert([
                     'processId' => $uuid,
                     'errReason' => '419 - Page Expired',
-                    'errApiReason' => $message
+                    'errStatus' => $message
                 ]);
                DB::table('accessLogs')->insert([
                    'processId' => $uuid,
                    'routePath' => $currentRouteInfo,
-                   'accessIpAddress' => true
+                   'accessIpAddress' => $userIp
                ]);
            } catch (QueryException $ex) {
                Log::error('Query Exception failed with: '. $e->getMessage());
@@ -190,13 +190,13 @@ public function render($request, Throwable $exception)
                 DB::table('appLogs')->insert([
                     'processId' => $uuid,
                     'errReason' => '429 - Too Many Requests',
-                    'errApiReason' => $message
-                ]);
-                DB::table('accessLogs')->insert([
-                    'processId' => $uuid,
-                    'routePath' => $currentRouteInfo,
-                    'accessIpAddress' => true
+                    'errStatus' => $message
                 ]);
+               DB::table('accessLogs')->insert([
+                   'processId' => $uuid,
+                   'routePath' => $currentRouteInfo,
+                   'accessIpAddress' => $userIp
+               ]);
            } catch (QueryException $ex) {
                Log::error('Query Exception failed with: '. $e->getMessage());
            }
@@ -207,14 +207,12 @@ public function render($request, Throwable $exception)
                 DB::table('appLogs')->insert([
                     'processId' => $uuid,
                     'errReason' => '500 - Internal Server Error',
-                    'errApiReason' => $message
+                    'errStatus' => $message
                 ]);
                DB::table('accessLogs')->insert([
                    'processId' => $uuid,
                    'routePath' => $currentRouteInfo,
-                   'accessIpAddress' => true,
-                   'routeExceptionMessage' => '500 - Internal Server Error',
-                   'routeExceptionLog' => $message
+                   'accessIpAddress' => $userIp
                ]);
            } catch (QueryException $ex) {
                Log::error('Query Exception failed with: '. $e->getMessage());
@@ -226,14 +224,12 @@ public function render($request, Throwable $exception)
                 DB::table('appLogs')->insert([
                     'processId' => $uuid,
                     'errReason' => '503 - Service Temporary Unavailable',
-                    'errApiReason' => $message
+                    'errStatus' => $message
                 ]);
                DB::table('accessLogs')->insert([
                    'processId' => $uuid,
                    'routePath' => $currentRouteInfo,
-                   'accessIpAddress' => true,
-                   'routeExceptionMessage' => '503 - Service Temporary Unavailable',
-                   'routeExceptionLog' => $message
+                   'accessIpAddress' => $userIp
                ]);
            } catch (QueryException $ex) {
                Log::error('Query Exception failed with: '. $e->getMessage());

diff --git a/app/Helpers/NotificationHelper.php b/app/Helpers/NotificationHelper.php
@@ -36,14 +36,17 @@ function sendRouteErrNotify($processId, $status, $errReason, $errRoute, $errCode
             $messageId = $response->getMessageId();
 
             try {
+                DB::table('appLogs')->insert([
+                    'processId' => $processId,
+                    'errReason' => null,
+                    'errApiReason' => null,
+				]);
                 DB::table('notifyLogs')->insert([
                     'processId' => $processId,
                     'notifyName' => 'Telegram SDK',
                     'notifyResult' => true,
                     'notifyMessage' => 'Message has been sent !',
-                    'notifyResponse' => $response,
-                    'notifyErrStatus' => $errReason,
-                    'notifyErrMessage' => $errCode
+                    'notifyResponse' => $response
                 ]);
             } catch (QueryException $ex) {
                 Log::error('Query Exception failed with: '. $ex->getMessage());
@@ -55,28 +58,34 @@ function sendRouteErrNotify($processId, $status, $errReason, $errRoute, $errCode
                 } else {
                   $httpStatus = $e->getHttpStatusCode();
                 }
+                DB::table('appLogs')->insert([
+                    'processId' => $processId,
+                    'errReason' => 'TelegramResponseException',
+                    'errApiReason' => $e->getMessage(),
+				]);
                 DB::table('notifyLogs')->insert([
                     'processId' => $processId,
                     'notifyName' => 'Telegram SDK',
                     'notifyResult' => false,
-                    'notifyMessage' => $e->getMessage(),
-                    'notifyResponse' => null,
-                    'notifyErrStatus' => $httpStatus,
-                    'notifyErrMessage' => $e->getErrorType()
+                    'notifyMessage' => 'TelegramResponseException',
+                    'notifyResponse' => $e->getMessage()+' | '+$httpStatus+' | '+$e->getErrorType()
                 ]);
             } catch (QueryException $ex) {
                 Log::error('Query Exception failed with: '. $ex->getMessage());
             }
         } catch (\Exception $e) {
             try {
+                DB::table('appLogs')->insert([
+                    'processId' => $processId,
+                    'errReason' => 'Unexpected handling exception !',
+                    'errApiReason' => $e->getMessage(),
+				]);
                 DB::table('notifyLogs')->insert([
                     'processId' => $processId,
                     'notifyName' => 'Telegram SDK',
                     'notifyResult' => false,
                     'notifyMessage' => 'Unexpected handling exception !',
-                    'notifyResponse' => null,
-                    'notifyErrStatus' => null,
-                    'notifyErrMessage' => $e->getMessage()
+                    'notifyResponse' => $e->getMessage()
                 ]);
             } catch (QueryException $ex) {
                 Log::error('Query Exception failed with: '. $ex->getMessage());

diff --git a/public/build/assets/kao-logic-DB00_MMO.js → public/build/assets/kao-logic-iKWRdJWb.js b/public/build/assets/kao-logic-DB00_MMO.js → public/build/assets/kao-logic-iKWRdJWb.js
diff --git a/public/build/manifest.json b/public/build/manifest.json
@@ -28,7 +28,7 @@
     ]
   },
   "resources/js/kao-logic.js": {
-    "file": "assets/kao-logic-DB00_MMO.js",
+    "file": "assets/kao-logic-iKWRdJWb.js",
     "name": "kao-logic",
     "src": "resources/js/kao-logic.js",
     "isEntry": true,

diff --git a/resources/js/kao-logic.js b/resources/js/kao-logic.js
@@ -848,15 +848,20 @@ function apiGateway(proc, action) {
     sendToAPI(files,proc,action).then(function () {
         loadingModal.hide()
     }).catch(function (error) {
-        errModal.hide()
-        errMessage.innerText  = "There was unexpected error !"
-        errSubMessage.innerText = ""
-        errListTitleMessage.innerText = "Error message"
-        resetErrListMessage()
-        generateMesssage(error.xhrRequestStatus+" - "+error.xhrRequestMessage)
-        errAltSubMessageModal.style = null
-        loadingModal.hide()
-        errModal.show()
+        if (error.xhrRequestStatus == 2 || error.xhrRequestStatus == 4) {
+            // Do not treat this status as error
+            loadingModal.hide()
+        } else {
+            errModal.hide()
+            errMessage.innerText  = "There was unexpected error !"
+            errSubMessage.innerText = ""
+            errListTitleMessage.innerText = "Error message"
+            resetErrListMessage()
+            generateMesssage(error.xhrRequestStatus+" - "+error.xhrRequestMessage)
+            errAltSubMessageModal.style = null
+            loadingModal.hide()
+            errModal.show()
+        }
     })
 }
 
@@ -1169,7 +1174,7 @@ function sendToAPI(files, proc, action) {
                     xhrRequestCondition: 'ERROR',
                     xhrRequestMessage: 'Server are not in readyState ! ('+xhr.readyState+')',
                     xhrRequestServerMessage: '',
-                    xhrRequestStatus: 0
+                    xhrRequestStatus: xhr.readyState
                 })
             }
         }

diff --git a/resources/views/layouts/alternate-layout.blade.php b/resources/views/layouts/alternate-layout.blade.php
@@ -9,7 +9,7 @@
     <div id="content" class="flex flex-col min-h-screen justify-between">
         @yield('content')
     </div>
-    <script async type="module" src="{{asset('build/assets/kao-logic-DB00_MMO.js')}}"></script>
+    <script async type="module" src="{{asset('build/assets/kao-logic-iKWRdJWb.js')}}"></script>
     <script async type="module" src="https://unpkg.com/pdfjs-dist@4.0.379/build/pdf.mjs"></script>
     <script async type="module" src="https://unpkg.com/pdfjs-dist@4.0.379/build/pdf.worker.mjs"></script>
     <script async type="text/javascript" src="{{asset('ext-js/kao-controller.js')}}"></script>

diff --git a/resources/views/layouts/main-layout.blade.php b/resources/views/layouts/main-layout.blade.php
@@ -9,7 +9,7 @@
     <div id="content" class="flex flex-col min-h-screen justify-between">
         @yield('content')
     </div>
-    <script async type="module" src="{{asset('build/assets/kao-logic-DB00_MMO.js')}}"></script>
+    <script async type="module" src="{{asset('build/assets/kao-logic-iKWRdJWb.js')}}"></script>
     <script async type="text/javascript" src="{{asset('ext-js/kao-controller.js')}}"></script>
     <script async type="text/javascript" src="{{asset('ext-js/kao-main.js')}}"></script>
     <script async type="text/javascript" src="https://unpkg.com/@material-tailwind/html@latest/scripts/ripple.js"></script>