Add search expressions

README.md

@@ -84,4 +84,5 @@ By default, the application is available at: `{APP_URL}/log-viewer`.
 - [Disabling the default monolog configuration](docs/disabling-default-monolog-configuration.md)
 - [Adding additional log files](docs/adding-additional-log-files.md)
 - [Configuring the back home url](docs/configuring-the-back-home-route.md)
+- [Advanced search queries](docs/search-queries.md)
 - [Full configuration reference](docs/configuration-reference.md)

docs/advanced-search-queries.md

@@ -0,0 +1,39 @@
+# Searching logs
+
+The search query allows for more fine-grained control over the search results. The following operators are supported:
+
+| Operator                             | Short | Description                                                                     |
+|--------------------------------------|-------|---------------------------------------------------------------------------------|
+| `before:<date>`,`before:"<date>"`    | `b`   | Show all logs messages that occur before the specified date.                    |
+| `after:<date>`,`after:"<date>"`      | `a`   | Show all logs messages that occur after the specified date.                     |
+| `exclude:<word>`,`exclude:"<words>"` | `-`   | Exclude the specific sentence from the results. Can be specified multiple times |
+
+## Example
+
+Search all log entries between `2020-01-01` and `2020-01-31`, excluding all entries that contain the word `"Controller"` and must
+include `"Exception"`.
+
+```text
+before:2020-01-31 after:2020-01-01 exclude:Controller "Failed to read"
+```
+
+### In shorthand
+
+```text
+b:2020-01-31 a:2020-01-01 -:Controller "Failed to read"
+```
+
+### Multiple exclusions
+
+```text
+before:2020-01-31 after:2020-01-01 exclude:Controller exclude:404
+```
+
+### Handling whitespace
+
+If you want to search for a sentence that contains whitespace, you can use double quotes to indicate that the words should be treated as a single
+word.
+
+```text
+before:"2020-01-31 23:59:59" after:"2020-01-01 00:00:00" exclude:"new IndexController" "Failed to read"
+```

frontend/src/router/index.ts

@@ -1,3 +1,4 @@
+import ErrorView from '@/views/ErrorView.vue';
 import FileNotFoundView from '@/views/FileNotFoundView.vue';
 import HomeView from '@/views/HomeView.vue'
 import LogView from '@/views/LogView.vue';
@@ -21,6 +22,11 @@ function router(baseUri: string) {
                 path: '/404',
                 name: 'file-not-found',
                 component: FileNotFoundView
+            },
+            {
+                path: '/5XX',
+                name: 'error',
+                component: ErrorView
             }
         ]
     });

frontend/src/stores/log_records.ts

@@ -37,8 +37,14 @@ export const useLogRecordStore = defineStore('log_records', () => {
             const response = await axios.get<LogRecords>('/api/logs', {params: params});
             records.value  = response.data;
         } catch (e) {
+            if (e instanceof AxiosError && e.response?.status === 400) {
+                throw new Error('bad-request');
+            }
             if (e instanceof AxiosError && e.response?.status === 404) {
-                throw e;
+                throw new Error('file-not-found');
+            }
+            if (e instanceof AxiosError && [500, 501, 502, 503, 504].includes(Number(e.response?.status))) {
+                throw new Error('error');
             }
             console.error(e);
             records.value = defaultData;

frontend/src/views/ErrorView.vue

@@ -0,0 +1,21 @@
+<template>
+    <div class="failure">
+        <div class="alert alert-danger label">
+            An error occurred while reading the log file.
+        </div>
+    </div>
+</template>
+
+<style scoped>
+.failure {
+    position: relative;
+
+    .label {
+        position: absolute;
+        top: 50%;
+        left: 50%;
+        transform: translate(-50%, -50%);
+    }
+}
+</style>
+<script setup lang="ts"></script>

frontend/src/views/LogView.vue

@@ -14,13 +14,14 @@ const router         = useRouter();
 const route          = useRoute();
 const logRecordStore = useLogRecordStore();
 
-const file     = ref('');
-const query    = ref('');
-const levels   = ref<Checklist>({choices: {}, selected: []});
-const channels = ref<Checklist>({choices: {}, selected: []});
-const perPage  = ref('50');
-const sort     = ref('desc');
-const offset   = ref(0);
+const file       = ref('');
+const query      = ref('');
+const levels     = ref<Checklist>({choices: {}, selected: []});
+const channels   = ref<Checklist>({choices: {}, selected: []});
+const perPage    = ref('50');
+const sort       = ref('desc');
+const offset     = ref(0);
+const badRequest = ref(false);
 
 const navigate = () => {
     const fileOffset = offset.value > 0 && logRecordStore.records.paginator?.direction !== sort.value ? 0 : offset.value;
@@ -38,13 +39,21 @@ const navigate = () => {
 }
 
 const load = () => {
+    badRequest.value = false;
     logRecordStore
         .fetch(file.value, levels.value.selected, channels.value.selected, sort.value, perPage.value, query.value, offset.value)
         .then(() => {
             levels.value   = logRecordStore.records.levels;
             channels.value = logRecordStore.records.channels;
         })
-        .catch(() => router.push({name: 'file-not-found'}));
+        .catch((error: Error) => {
+            if (error.message === 'bad-request') {
+                badRequest.value = true;
+                return;
+            }
+
+            router.push({name: error.message});
+        });
 }
 
 onMounted(() => {
@@ -68,6 +77,7 @@ onMounted(() => {
             <div class="flex-grow-1 input-group">
                 <input type="text"
                        class="form-control"
+                       :class="{'is-invalid': badRequest}"
                        placeholder="Search log entries"
                        aria-label="Search log entries"
                        aria-describedby="button-search"

src/Controller/LogRecordsController.php

@@ -3,12 +3,15 @@
 
 namespace FD\LogViewer\Controller;
 
+use Exception;
 use FD\LogViewer\Service\File\LogFileService;
 use FD\LogViewer\Service\File\LogQueryDtoFactory;
 use FD\LogViewer\Service\File\LogRecordsOutputProvider;
+use FD\LogViewer\Service\Parser\InvalidDateTimeException;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 class LogRecordsController extends AbstractController
@@ -20,10 +23,18 @@ public function __construct(
     ) {
     }
 
+    /**
+     * @throws Exception
+     */
     public function __invoke(Request $request): JsonResponse
     {
-        $logQuery = $this->queryDtoFactory->create($request);
-        $file     = $this->fileService->findFileByIdentifier($logQuery->fileIdentifier);
+        try {
+            $logQuery = $this->queryDtoFactory->create($request);
+        } catch (InvalidDateTimeException $exception) {
+            throw new BadRequestHttpException('Invalid date.', $exception);
+        }
+
+        $file = $this->fileService->findFileByIdentifier($logQuery->fileIdentifier);
         if ($file === null) {
             throw new NotFoundHttpException(sprintf('Log file with id `%s` not found.', $logQuery->fileIdentifier));
         }

src/Entity/Expression/DateAfterTerm.php

@@ -0,0 +1,16 @@
+<?php
+declare(strict_types=1);
+
+namespace FD\LogViewer\Entity\Expression;
+
+use DateTimeImmutable;
+
+class DateAfterTerm implements TermInterface
+{
+    /**
+     * @codeCoverageIgnore Simple DTO
+     */
+    public function __construct(public readonly DateTimeImmutable $date)
+    {
+    }
+}

src/Entity/Expression/DateBeforeTerm.php

@@ -0,0 +1,16 @@
+<?php
+declare(strict_types=1);
+
+namespace FD\LogViewer\Entity\Expression;
+
+use DateTimeImmutable;
+
+class DateBeforeTerm implements TermInterface
+{
+    /**
+     * @codeCoverageIgnore Simple DTO
+     */
+    public function __construct(public readonly DateTimeImmutable $date)
+    {
+    }
+}

src/Entity/Expression/Expression.php

@@ -0,0 +1,15 @@
+<?php
+declare(strict_types=1);
+
+namespace FD\LogViewer\Entity\Expression;
+
+class Expression
+{
+    /**
+     * @codeCoverageIgnore Simple DTO
+     * @param TermInterface[] $terms
+     */
+    public function __construct(public readonly array $terms)
+    {
+    }
+}

src/Entity/Expression/TermInterface.php

@@ -0,0 +1,8 @@
+<?php
+declare(strict_types=1);
+
+namespace FD\LogViewer\Entity\Expression;
+
+interface TermInterface
+{
+}

src/Entity/Expression/WordTerm.php

@@ -0,0 +1,18 @@
+<?php
+declare(strict_types=1);
+
+namespace FD\LogViewer\Entity\Expression;
+
+class WordTerm implements TermInterface
+{
+    public const TYPE_INCLUDE = 'include';
+    public const TYPE_EXCLUDE = 'exclude';
+
+    /**
+     * @codeCoverageIgnore Simple DTO
+     * @phpstan-param self::TYPE_* $type
+     */
+    public function __construct(public readonly string $string, public readonly string $type)
+    {
+    }
+}

src/Entity/Request/LogQueryDto.php

@@ -3,6 +3,7 @@
 
 namespace FD\LogViewer\Entity\Request;
 
+use FD\LogViewer\Entity\Expression\Expression;
 use FD\LogViewer\Entity\Output\DirectionEnum;
 
 class LogQueryDto
@@ -16,7 +17,7 @@ class LogQueryDto
     public function __construct(
         public readonly string $fileIdentifier,
         public readonly ?int $offset = null,
-        public readonly string $query = '',
+        public readonly ?Expression $query = null,
         public readonly DirectionEnum $direction = DirectionEnum::Desc,
         public readonly ?array $levels = null,
         public readonly ?array $channels = null,

src/Iterator/LogLineParserIterator.php

@@ -4,8 +4,8 @@
 namespace FD\LogViewer\Iterator;
 
 use FD\LogViewer\Entity\Output\DirectionEnum;
+use FD\LogViewer\Reader\Stream\AbstractStreamReader;
 use FD\LogViewer\Service\File\LogLineParserInterface;
-use FD\LogViewer\StreamReader\AbstractStreamReader;
 use IteratorAggregate;
 use Traversable;
 

src/Iterator/LogRecordFilterIterator.php

@@ -3,7 +3,9 @@
 
 namespace FD\LogViewer\Iterator;
 
+use FD\LogViewer\Entity\Expression\Expression;
 use FD\LogViewer\Entity\Index\LogRecord;
+use FD\LogViewer\Service\Matcher\LogRecordMatcher;
 use IteratorAggregate;
 use Traversable;
 
@@ -22,9 +24,14 @@ class LogRecordFilterIterator implements IteratorAggregate
      * @param string[]|null            $levels
      * @param string[]|null            $channels
      */
-    public function __construct(private readonly iterable $iterator, ?array $levels, ?array $channels)
-    {
-        $this->levels   = $levels === null ? null : array_flip($levels);
+    public function __construct(
+        private readonly LogRecordMatcher $matcher,
+        private readonly iterable $iterator,
+        private readonly ?Expression $query,
+        ?array $levels,
+        ?array $channels
+    ) {
+        $this->levels = $levels === null ? null : array_flip($levels);
         $this->channels = $channels === null ? null : array_flip($channels);
     }
 
@@ -39,6 +46,10 @@ public function getIterator(): Traversable
                 continue;
             }
 
+            if ($this->query !== null && $this->matcher->matches($record, $this->query) === false) {
+                continue;
+            }
+
             yield $key => $record;
         }
     }

src/Iterator/LogRecordIterator.php

@@ -19,19 +19,15 @@ class LogRecordIterator implements IteratorAggregate
     public function __construct(
         private readonly Traversable $iterator,
         private readonly LogLineParserInterface $lineParser,
-        private readonly string $query
     ) {
     }
 
     public function getIterator(): Traversable
     {
         foreach ($this->iterator as $message) {
-            if ($this->query !== '' && stripos($message, $this->query) === false) {
-                continue;
-            }
-
             $lineData = $this->lineParser->parse($message);
             if ($lineData === null) {
+                yield new LogRecord(0, 'error', 'parse', $message, [], []);
                 continue;
             }
 

src/StreamReader/AbstractStreamReader.php → src/Reader/Stream/AbstractStreamReader.php

@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace FD\LogViewer\StreamReader;
+namespace FD\LogViewer\Reader\Stream;
 
 use Generator;
 use IteratorAggregate;

src/StreamReader/ForwardStreamReader.php → src/Reader/Stream/ForwardStreamReader.php

@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace FD\LogViewer\StreamReader;
+namespace FD\LogViewer\Reader\Stream;
 
 use Generator;
 

src/StreamReader/ReverseStreamReader.php → src/Reader/Stream/ReverseStreamReader.php

@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace FD\LogViewer\StreamReader;
+namespace FD\LogViewer\Reader\Stream;
 
 use Generator;
 

src/StreamReader/StreamReaderFactory.php → src/Reader/Stream/StreamReaderFactory.php

@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace FD\LogViewer\StreamReader;
+namespace FD\LogViewer\Reader\Stream;
 
 use FD\LogViewer\Entity\Output\DirectionEnum;
 use RuntimeException;