fix: some edge cases

Author: abdul-kaioum

backend/app/HTTP/Services/LogService.php

@@ -79,7 +79,7 @@ public function save($status, $details, $message = null)
         }
 
         $log->subject      = Arr::get($details, 'subject', '');
-        $log->to_addr      = Arr::get($details, 'to', '');
+        $log->to_addr      = Arr::get($details, 'to', '[]');
 
         unset($details['subject'], $details['to'], $details['from'], $details['phpmailer_exception_code']);
         $log->details    = $details;

backend/db/Migrations/BitSmtpLogsTableMigration.php

@@ -20,7 +20,7 @@ function (Blueprint $table) {
                 $table->id();
                 $table->tinyint('status');
                 $table->longtext('subject');
-                $table->varchar('to_addr', 320);
+                $table->longtext('to_addr');
                 $table->longtext('details')->nullable();
                 $table->text('debug_info')->nullable();
                 $table->tinyint('retry_count')->defaultValue(0);

frontend/src/common/helpers/request.ts

@@ -1,4 +1,6 @@
+import notify from '@components/Toaster/Toaster'
 import config from '@config/config'
+import { __ } from './i18nwrap'
 
 /* eslint-disable no-restricted-syntax */
 /* eslint-disable no-undef */
@@ -73,8 +75,46 @@ export default async function request<T>({
       try {
         return JSON.parse(res)
       } catch (error) {
-        const parsedRes = res.match(/{"code":(?:[^{}]*)*}/)
-        return parsedRes ? JSON.parse(parsedRes[0]) : { code: 'ERROR', data: res }
+        const parsedRes = extractJSON(res)
+        const parsedData = (
+          parsedRes === ''
+            ? { code: 'ERROR', message: __('Failed to parsed response'), data: res }
+            : parsedRes
+        ) as Response<unknown>
+
+        if (parsedData.code === 'ERROR') {
+          notify.error(parsedData.message as string)
+        }
+
+        return parsedData
       }
     })) as Response<T>
 }
+
+function extractJSON(str: string) {
+  if (typeof str !== 'string') return null
+
+  let braceCount = 0
+  let start = -1
+
+  for (let i = 0; i < str.length; i += 1) {
+    if (str[i] === '{') {
+      if (braceCount === 0) {
+        start = i
+      }
+      braceCount += 1
+    } else if (str[i] === '}') {
+      braceCount -= 1
+      if (braceCount === 0 && start !== -1) {
+        const jsonStr = str.substring(start, i + 1)
+        try {
+          return JSON.parse(jsonStr)
+        } catch (e) {
+          return ''
+        }
+      }
+    }
+  }
+
+  return null
+}

frontend/src/pages/Layout/Header.tsx

@@ -30,17 +30,7 @@ export default function Header() {
     { label: __('Logs'), path: '/logs' },
     { label: __('Others'), path: '/others' }
   ]
-  console.log(
-    'Path---->Selected',
-    navItems.find(item => {
-      console.log(
-        `item ${item.path}`,
-        `path: ${location.pathname}`,
-        `idx: ${location.pathname.includes(item.path)}`
-      )
-      return item.path === '/' ? item.path === location.pathname : location.pathname.includes(item.path)
-    })
-  )
+
   const handleConfetti = () => {
     confetti({
       particleCount: 100,