From d4004f812f66e8a608a44a314e219db78bd3763d Mon Sep 17 00:00:00 2001
From: Sulaiman AlRomaih <xSloMxSA@gmail.com>
Date: Sun, 8 Sep 2024 22:50:08 +0300
Subject: [PATCH 01/12] Remove file file reassembler,  Add test dependencies.

---
 Cargo.lock               | 105 +++++++++++++++++++++++++++++++++++++--
 client/angular.json      |   4 +-
 server/Cargo.toml        |   6 ++-
 server/src/attachment.rs |  39 +--------------
 server/src/lib.rs        |   4 +-
 server/src/server.rs     |   3 +-
 server/src/session.rs    |   3 --
 7 files changed, 113 insertions(+), 51 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 59a83cc..2c72ba0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -77,7 +77,7 @@ dependencies = [
  "flate2",
  "futures-core",
  "h2",
- "http",
+ "http 0.2.12",
  "httparse",
  "httpdate",
  "itoa",
@@ -95,6 +95,31 @@ dependencies = [
  "zstd",
 ]
 
+[[package]]
+name = "actix-http-test"
+version = "3.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "061d27c2a6fea968fdaca0961ff429d23a4ec878c4f68f5d08626663ade69c80"
+dependencies = [
+ "actix-codec",
+ "actix-rt",
+ "actix-server",
+ "actix-service",
+ "actix-tls",
+ "actix-utils",
+ "awc",
+ "bytes",
+ "futures-core",
+ "http 0.2.12",
+ "log",
+ "serde",
+ "serde_json",
+ "serde_urlencoded",
+ "slab",
+ "socket2",
+ "tokio",
+]
+
 [[package]]
 name = "actix-macros"
 version = "0.2.4"
@@ -113,7 +138,7 @@ checksum = "13d324164c51f63867b57e73ba5936ea151b8a41a1d23d1031eeb9f70d0236f8"
 dependencies = [
  "bytestring",
  "cfg-if",
- "http",
+ "http 0.2.12",
  "regex",
  "regex-lite",
  "serde",
@@ -159,6 +184,29 @@ dependencies = [
  "pin-project-lite",
 ]
 
+[[package]]
+name = "actix-test"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "439022b5a7b5dac10798465029a9566e8e0cca7a6014541ed277b695691fac5f"
+dependencies = [
+ "actix-codec",
+ "actix-http",
+ "actix-http-test",
+ "actix-rt",
+ "actix-service",
+ "actix-utils",
+ "actix-web",
+ "awc",
+ "futures-core",
+ "futures-util",
+ "log",
+ "serde",
+ "serde_json",
+ "serde_urlencoded",
+ "tokio",
+]
+
 [[package]]
 name = "actix-tls"
 version = "3.4.0"
@@ -169,6 +217,8 @@ dependencies = [
  "actix-service",
  "actix-utils",
  "futures-core",
+ "http 0.2.12",
+ "http 1.1.0",
  "impl-more",
  "openssl",
  "pin-project-lite",
@@ -390,6 +440,39 @@ version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
+[[package]]
+name = "awc"
+version = "3.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79049b2461279b886e46f1107efc347ebecc7b88d74d023dda010551a124967b"
+dependencies = [
+ "actix-codec",
+ "actix-http",
+ "actix-rt",
+ "actix-service",
+ "actix-tls",
+ "actix-utils",
+ "base64",
+ "bytes",
+ "cfg-if",
+ "cookie",
+ "derive_more 0.99.18",
+ "futures-core",
+ "futures-util",
+ "h2",
+ "http 0.2.12",
+ "itoa",
+ "log",
+ "mime",
+ "percent-encoding",
+ "pin-project-lite",
+ "rand",
+ "serde",
+ "serde_json",
+ "serde_urlencoded",
+ "tokio",
+]
+
 [[package]]
 name = "backtrace"
 version = "0.3.73"
@@ -716,9 +799,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
 dependencies = [
  "futures-core",
+ "futures-sink",
  "futures-task",
  "pin-project-lite",
  "pin-utils",
+ "slab",
 ]
 
 [[package]]
@@ -759,7 +844,7 @@ dependencies = [
  "futures-core",
  "futures-sink",
  "futures-util",
- "http",
+ "http 0.2.12",
  "indexmap",
  "slab",
  "tokio",
@@ -790,6 +875,17 @@ dependencies = [
  "itoa",
 ]
 
+[[package]]
+name = "http"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258"
+dependencies = [
+ "bytes",
+ "fnv",
+ "itoa",
+]
+
 [[package]]
 name = "httparse"
 version = "1.9.4"
@@ -1247,11 +1343,14 @@ dependencies = [
  "actix-broker",
  "actix-http",
  "actix-rt",
+ "actix-test",
  "actix-web",
  "actix-web-actors",
  "base64",
+ "bytes",
  "derive_more 1.0.0",
  "env_logger",
+ "futures-util",
  "log",
  "names",
  "openssl",
diff --git a/client/angular.json b/client/angular.json
index de96bfc..f8a8f8a 100644
--- a/client/angular.json
+++ b/client/angular.json
@@ -95,8 +95,8 @@
             "development": {
               "buildTarget": "client:build:development",
               "ssl": true,
-              "sslKey": "../../../../../certs/key.pem",
-              "sslCert": "../../../../../certs/cert.pem",
+              "sslKey": "../certs/key.pem",
+              "sslCert": "../certs/cert.pem",
               "port": 443
             },
             "docker": {
diff --git a/server/Cargo.toml b/server/Cargo.toml
index c5f050d..4419900 100644
--- a/server/Cargo.toml
+++ b/server/Cargo.toml
@@ -12,7 +12,6 @@ actix = "0.13"
 actix-broker = "0.4"
 actix-web = { version = "4.7", features = ["openssl"] }
 actix-web-actors = "4.1"
-actix-rt = "2.5"
 actix-http = "3.9.0"
 
 uuid = { version = "1.10", features = ["v4"] }
@@ -25,6 +24,9 @@ base64 = "0.22.1"
 env_logger = "0.11"
 log = "0.4"
 rand = "0.8"
+bytes = "1"
 
 [dev-dependencies]
-actix-rt = "2.5"
\ No newline at end of file
+actix-rt = "2.2"
+actix-test = "0.1"
+futures-util = { version = "0.3.17", default-features = false, features = ["std"] }
\ No newline at end of file
diff --git a/server/src/attachment.rs b/server/src/attachment.rs
index 9e6d166..76e37da 100644
--- a/server/src/attachment.rs
+++ b/server/src/attachment.rs
@@ -1,46 +1,11 @@
-use std::collections::HashMap;
-
 use actix_web_actors::ws;
 use base64::{engine::general_purpose, Engine as _};
 
 use crate::{
-    message::FileChunkMetadata, ChatMessage, FileReassembler, ServerError, WsChatServer,
-    WsChatSession, MAX_FRAME_SIZE,
+    message::FileChunkMetadata, ChatMessage, ServerError, WsChatServer, WsChatSession,
+    MAX_FRAME_SIZE,
 };
 
-impl FileReassembler {
-    pub fn new(total_chunks: usize) -> Self {
-        FileReassembler {
-            chunks: HashMap::new(),
-            total_chunks,
-        }
-    }
-
-    pub fn add_chunk(&mut self, index: usize, data: Vec<u8>) -> Result<(), ServerError> {
-        if index >= self.total_chunks {
-            return Err(ServerError::IndexOutOfBounds);
-        }
-        self.chunks.insert(index, data);
-        Ok(())
-    }
-
-    pub fn is_complete(&self) -> bool {
-        self.chunks.len() == self.total_chunks
-    }
-
-    pub fn reassemble(&self) -> Result<Vec<u8>, ServerError> {
-        let mut file_data = Vec::new();
-        for i in 0..self.total_chunks {
-            if let Some(chunk) = self.chunks.get(&i) {
-                file_data.extend(chunk);
-            } else {
-                return Err(ServerError::ChunkMissing);
-            }
-        }
-        Ok(file_data)
-    }
-}
-
 impl WsChatServer {
     #[allow(dead_code)]
     pub fn send_chat_attachment(
diff --git a/server/src/lib.rs b/server/src/lib.rs
index d84778d..ff45b74 100644
--- a/server/src/lib.rs
+++ b/server/src/lib.rs
@@ -10,8 +10,8 @@ mod session_manager;
 
 pub use error::ServerError;
 pub use message::{
-    ChatMessage, ClientMetadata, FileReassembler, JoinRoom, LeaveRoom, ListRooms, SendFile,
-    SendMessage, WsChatServer, WsChatSession,
+    ChatMessage, ClientMetadata, JoinRoom, LeaveRoom, ListRooms, SendFile, SendMessage,
+    WsChatServer, WsChatSession,
 };
 pub use session_manager::SessionManager;
 
diff --git a/server/src/server.rs b/server/src/server.rs
index dde02d1..637fb8f 100644
--- a/server/src/server.rs
+++ b/server/src/server.rs
@@ -1,6 +1,5 @@
-use std::collections::HashMap;
-use std::collections::hash_map::Entry::Vacant;
 use actix::prelude::*;
+use std::collections::{hash_map::Entry::Vacant, HashMap};
 
 use crate::message::{ChatMessage, Client, ClientMetadata, Room, WsChatServer};
 
diff --git a/server/src/session.rs b/server/src/session.rs
index 0adc3bb..1e829b5 100644
--- a/server/src/session.rs
+++ b/server/src/session.rs
@@ -1,5 +1,3 @@
-use std::collections::HashMap;
-
 use actix::prelude::*;
 use actix_broker::BrokerIssue;
 use actix_web_actors::ws;
@@ -19,7 +17,6 @@ impl WsChatSession {
             id: 0,
             room: "main".to_owned(),
             name,
-            file_reassemblers: HashMap::new(),
         }
     }
 

From 27a89ffd317439030cb6ccddab31d0cafa96cccf Mon Sep 17 00:00:00 2001
From: Sulaiman AlRomaih <xSloMxSA@gmail.com>
Date: Sun, 20 Oct 2024 14:58:59 +0300
Subject: [PATCH 02/12] Modify the chat component.

- Split every service to be alone.
- update the send file transfer and send message to be through webrtc.
---
 .../src/app/features/chat/chat.component.html |  19 +-
 .../src/app/features/chat/chat.component.ts   | 245 +++++++++++-------
 2 files changed, 162 insertions(+), 102 deletions(-)

diff --git a/client/src/app/features/chat/chat.component.html b/client/src/app/features/chat/chat.component.html
index a90ea47..6729d82 100644
--- a/client/src/app/features/chat/chat.component.html
+++ b/client/src/app/features/chat/chat.component.html
@@ -47,6 +47,17 @@ <h5 class="sidebar-title" style="margin-top: 20px;">Joined Members</h5>
       <div *ngFor="let msg of messages">
         <p [class.my-message]="isMyMessage(msg)">{{ msg }}</p>
       </div>
+
+      <!-- Incoming File Prompt -->
+      <div *ngIf="incomingFile" class="incoming-file-prompt">
+        <p>
+          You have an incoming file:
+          <strong>{{ incomingFile.fileName }}</strong>
+          ({{ incomingFile.fileSize | number }} bytes)
+        </p>
+        <button mat-button color="primary" (click)="acceptIncomingFile()">Accept</button>
+        <button mat-button color="warn" (click)="declineIncomingFile()">Decline</button>
+      </div>
     </div>
   </div>
 
@@ -63,13 +74,13 @@ <h5 class="sidebar-title" style="margin-top: 20px;">Joined Members</h5>
           required
         />
       </mat-form-field>
-      
+
       <!-- File Attachment Button -->
       <button mat-icon-button color="primary" type="button" (click)="fileInput.click()" class="send-button" style="margin: 10px;">
         <mat-icon>attach_file</mat-icon>
       </button>
       <input type="file" #fileInput (change)="sendAttachments($event)" multiple style="display: none;" />
-      
+
       <!-- Send Message Button -->
       <button mat-icon-button color="primary" type="submit" class="send-button">
         <mat-icon>send</mat-icon>
@@ -79,13 +90,13 @@ <h5 class="sidebar-title" style="margin-top: 20px;">Joined Members</h5>
 
   <!-- Upload Progress Indicator -->
   <div *ngIf="uploadProgress > 0" class="progress-bar">
-    <span>Upload Progress: {{ uploadProgress }}%</span>
+    <span style="margin-right: 12px">Upload Progress: {{ uploadProgress }}%</span>
     <progress [value]="uploadProgress" max="100"></progress>
   </div>
 
   <!-- Download Progress Indicator -->
   <div *ngIf="downloadProgress > 0" class="progress-bar">
-    <span>Download Progress: {{ downloadProgress }}%</span>
+    <span style="margin-right: 12px">Download Progress: {{ downloadProgress }}%</span>
     <progress [value]="downloadProgress" max="100"></progress>
   </div>
 </div>
diff --git a/client/src/app/features/chat/chat.component.ts b/client/src/app/features/chat/chat.component.ts
index 8e58e19..8216718 100644
--- a/client/src/app/features/chat/chat.component.ts
+++ b/client/src/app/features/chat/chat.component.ts
@@ -4,23 +4,30 @@ import {
   Inject,
   OnDestroy,
   OnInit,
-  PLATFORM_ID, AfterViewInit,
-} from "@angular/core";
-import { Subscription } from "rxjs";
-import { isPlatformBrowser } from "@angular/common";
-
-import { ThemeService } from "../../core/services/theme.service";
-import { WebsocketService } from "../../core/services/websocket.service";
-import { LoggerService } from "../../core/services/logger.service";
+  PLATFORM_ID,
+  AfterViewInit,
+} from '@angular/core';
+import { Subscription } from 'rxjs';
+import { isPlatformBrowser } from '@angular/common';
+
+import { ThemeService } from '../../core/services/theme.service';
+import { ChatService } from '../../core/services/chat.service';
+import { RoomService } from '../../core/services/room.service';
+import { FileTransferService } from '../../core/services/file-transfer.service';
+import { WebRTCService } from '../../core/services/webrtc.service';
+import { LoggerService } from '../../core/services/logger.service';
+import { WebSocketConnectionService } from '../../core/services/websocket-connection.service';
+import { UserService } from '../../core/services/user.service';
+import { take } from 'rxjs/operators';
 
 @Component({
-  selector: "app-chat",
-  templateUrl: "./chat.component.html",
-  styleUrls: ["./chat.component.css"],
+  selector: 'app-chat',
+  templateUrl: './chat.component.html',
+  styleUrls: ['./chat.component.css'],
 })
 export class ChatComponent implements OnInit, OnDestroy, AfterViewInit {
-  message = "";
-  newRoomName = "";
+  message = '';
+  newRoomName = '';
   uploadProgress = 0;
   downloadProgress = 0;
 
@@ -28,91 +35,85 @@ export class ChatComponent implements OnInit, OnDestroy, AfterViewInit {
   rooms: string[] = [];
   members: string[] = [];
 
-  currentRoom = "main";
+  currentRoom = 'main';
   isDarkMode = false;
 
-  private messageSubscription: Subscription = new Subscription();
-  private roomSubscription: Subscription = new Subscription();
-  private membersSubscription: Subscription = new Subscription();
-  private progressSubscription: Subscription = new Subscription();
+  incomingFile: { fileName: string; fileSize: number } | null = null;
+  private subscriptions: Subscription[] = [];
 
   constructor(
-    private chatService: WebsocketService,
+    private chatService: ChatService,
+    private roomService: RoomService,
+    private fileTransferService: FileTransferService,
+    private webrtcService: WebRTCService,
+    private wsConnectionService: WebSocketConnectionService,
     private themeService: ThemeService,
     private cdr: ChangeDetectorRef,
     private logger: LoggerService,
+    private userService: UserService,
     @Inject(PLATFORM_ID) private platformId: object
   ) {}
 
   ngOnInit(): void {
-    this.messageSubscription = this.chatService.message$.subscribe({
-      next: (message) => {
-        if (message.trim()) {
-          this.messages.push(message);
+    this.subscriptions.push(
+      this.userService.user$.subscribe((username) => {
+        if (username) {
+          this.logger.log(`Username is set to: ${username}`);
+          this.initializeChat();
         }
+      })
+    );
+
+    if (isPlatformBrowser(this.platformId)) {
+      const themePreference = localStorage.getItem('themePreference');
+      this.isDarkMode = themePreference === 'dark';
+      this.applyTheme(this.isDarkMode);
+    }
+  }
+
+  private initializeChat() {
+    this.subscriptions.push(
+      this.chatService.messages$.subscribe((messages) => {
+        this.messages = messages;
         this.cdr.detectChanges();
-      },
-      error: (error) => {
-        console.error("WebSocket error:", error);
-      },
-      complete: () => {
-        console.warn("WebSocket connection closed");
-      },
-    });
+      })
+    );
 
-    this.roomSubscription = this.chatService.rooms$.subscribe({
-      next: (room) => {
-        this.rooms = room;
-      },
-      error: (error) => {
-        console.error("WebSocket error:", error);
-      },
-      complete: () => {
-        console.warn("WebSocket connection closed");
-      },
-    });
+    this.subscriptions.push(
+      this.roomService.rooms$.subscribe((rooms) => {
+        this.rooms = rooms;
+        this.cdr.detectChanges();
+      })
+    );
 
-    this.membersSubscription = this.chatService.members$.subscribe({
-      next: (member) => {
-        this.members = member;
-      },
-      error: (error) => {
-        console.error("WebSocket error:", error);
-      },
-      complete: () => {
-        console.warn("WebSocket connection closed");
-      },
-    });
+    this.subscriptions.push(
+      this.roomService.members$.subscribe((members) => {
+        this.members = members;
+        this.cdr.detectChanges();
+        this.initiateConnectionsWithMembers();
+      })
+    );
 
-    this.progressSubscription = this.chatService.uploadProgress$.subscribe({
-      next: (progress) => {
+    this.subscriptions.push(
+      this.fileTransferService.uploadProgress$.subscribe((progress) => {
         this.uploadProgress = progress;
         this.cdr.detectChanges();
-      },
-      error: (error) => {
-        console.error("WebSocket error:", error);
-      },
-      complete: () => {
-        console.warn("WebSocket connection closed");
-      },
-    });
+      })
+    );
 
-    this.progressSubscription.add(
-      this.chatService.downloadProgress$.subscribe({
-        next: (progress) => {
-          this.downloadProgress = progress;
-          this.cdr.detectChanges();
-        },
-        error: (error) => {
-          console.error("Download Progress error:", error);
-        },
+    this.subscriptions.push(
+      this.fileTransferService.downloadProgress$.subscribe((progress) => {
+        this.downloadProgress = progress;
+        this.cdr.detectChanges();
       })
     );
 
-    if (isPlatformBrowser(this.platformId)) {
-      const themePreference = localStorage.getItem("themePreference");
-      this.isDarkMode = themePreference === "dark";
-    }
+    this.subscriptions.push(
+      this.fileTransferService.incomingFile$.subscribe((fileInfo) => {
+        this.incomingFile = fileInfo;
+        this.cdr.detectChanges();
+      })
+    );
   }
 
   ngAfterViewInit(): void {
@@ -128,45 +129,86 @@ export class ChatComponent implements OnInit, OnDestroy, AfterViewInit {
   }
 
   private applyTheme(isDarkMode: boolean): void {
-    document.body.classList.toggle("dark-mode", isDarkMode);
-    document.body.classList.toggle("light-mode", !isDarkMode);
+    document.body.classList.toggle('dark-mode', isDarkMode);
+    document.body.classList.toggle('light-mode', !isDarkMode);
   }
 
   connect(): void {
-    this.chatService
+    this.wsConnectionService
       .connect()
       .then(() => {
-        this.listRooms();
+        this.roomService.listRooms();
+        this.chatService.getUsername();
       })
       .catch((error) => {
-        console.error("WebSocket connection failed:", error);
+        console.error('WebSocket connection failed:', error);
       });
   }
 
   sendMessage(): void {
-    if (this.message.trim()) {
-      const userMessage = "[UserMessage] " + this.message.trim();
-      this.chatService.sendMessage(userMessage);
-      this.message = "";
-    }
+    const otherMembers = this.members.filter((m) => m !== this.userService.user);
+    otherMembers.forEach((member) => {
+      if (this.message.trim()) {
+        this.chatService.sendMessage(this.message, member);
+        this.message = '';
+      }
+    });
   }
 
   sendAttachments(event: Event): void {
     const input = event.target as HTMLInputElement;
     if (input.files && input.files.length > 0) {
-      this.chatService.sendAttachments(input.files);
-      input.value = "";
+      const fileToSend = input.files[0];
+      input.value = '';
+
+      const otherMembers = this.members.filter((m) => m !== this.userService.user);
+      if (otherMembers.length === 0) {
+        alert('No other users available to send the file.');
+        return;
+      }
+      otherMembers.forEach((member) => {
+        this.fileTransferService.prepareFileForSending(fileToSend, member);
+        if (!this.webrtcService.isConnected(member)) {
+          this.webrtcService.initiateConnection(member);
+        }
+
+        this.webrtcService.dataChannelOpen$
+          .pipe(take(1))
+          .subscribe((isOpen) => {
+            if (isOpen) {
+              this.fileTransferService.sendFileOffer();
+            }
+          });
+      });
+    }
+  }
+
+  public acceptIncomingFile(): void {
+    this.fileTransferService.startSavingFile();
+  }
+
+  public declineIncomingFile(): void {
+    this.incomingFile = null;
+    this.fileTransferService.incomingFile$.next(null);
+
+    const fromUser = this.fileTransferService.incomingFile$.value?.fromUser;
+    if (fromUser) {
+      const message = {
+        type: 'file-decline',
+        payload: {},
+      };
+      this.webrtcService.sendData(message, fromUser);
     }
   }
 
   listRooms(): void {
-    this.logger.log("Listing rooms");
-    this.chatService.listRooms();
+    this.logger.log('Listing rooms');
+    this.roomService.listRooms();
   }
 
   joinRoom(room: string): void {
     if (room !== this.currentRoom) {
-      this.chatService.joinRoom(room);
+      this.roomService.joinRoom(room);
       this.currentRoom = room;
     }
   }
@@ -174,22 +216,29 @@ export class ChatComponent implements OnInit, OnDestroy, AfterViewInit {
   createRoom(): void {
     if (this.newRoomName.trim() && this.newRoomName !== this.currentRoom) {
       this.joinRoom(this.newRoomName.trim());
-      this.newRoomName = "";
+      this.newRoomName = '';
     }
   }
 
   isMyMessage(msg: string): boolean {
-    return msg.startsWith(this.chatService.user);
+    return msg.startsWith(this.userService.user);
   }
 
   isMyUser(member: string): boolean {
-    return member.trim() === this.chatService.user.trim();
+    return member.trim() === this.userService.user.trim();
   }
 
   ngOnDestroy(): void {
-    this.messageSubscription.unsubscribe();
-    this.roomSubscription.unsubscribe();
-    this.progressSubscription.unsubscribe();
-    this.membersSubscription.unsubscribe();
+    this.subscriptions.forEach((sub) => sub.unsubscribe());
+    this.webrtcService.closeAllConnections();
+  }
+
+  private initiateConnectionsWithMembers(): void {
+    const otherMembers = this.members.filter((m) => m !== this.userService.user);
+    otherMembers.forEach((member) => {
+      if (this.userService.user < member) {
+        this.webrtcService.initiateConnection(member);
+      }
+    });
   }
 }

From 64d027a60beab2e23c020be1e9e3f85f59c6c2bc Mon Sep 17 00:00:00 2001
From: Sulaiman AlRomaih <xSloMxSA@gmail.com>
Date: Sun, 20 Oct 2024 15:01:04 +0300
Subject: [PATCH 03/12] Create a new WebSocket connection service.

- Split the services and focus on only the WebSocket functionality here.
---
 .../websocket-connection.service.spec.ts      |  16 +
 .../services/websocket-connection.service.ts  |  98 +++++
 .../app/core/services/websocket.service.ts    | 393 ------------------
 3 files changed, 114 insertions(+), 393 deletions(-)
 create mode 100644 client/src/app/core/services/websocket-connection.service.spec.ts
 create mode 100644 client/src/app/core/services/websocket-connection.service.ts
 delete mode 100644 client/src/app/core/services/websocket.service.ts

diff --git a/client/src/app/core/services/websocket-connection.service.spec.ts b/client/src/app/core/services/websocket-connection.service.spec.ts
new file mode 100644
index 0000000..f65e405
--- /dev/null
+++ b/client/src/app/core/services/websocket-connection.service.spec.ts
@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { WebsocketConnectionService } from './websocket-connection.service';
+
+describe('WebsocketConnectionService', () => {
+  let service: WebsocketConnectionService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(WebsocketConnectionService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});
diff --git a/client/src/app/core/services/websocket-connection.service.ts b/client/src/app/core/services/websocket-connection.service.ts
new file mode 100644
index 0000000..de9ed20
--- /dev/null
+++ b/client/src/app/core/services/websocket-connection.service.ts
@@ -0,0 +1,98 @@
+import { Injectable } from '@angular/core';
+import { BehaviorSubject } from 'rxjs';
+import { environment } from '../../environments/environment';
+import { LoggerService } from './logger.service';
+
+// WebSocket Message Interface
+export interface WebSocketMessage {
+  type: string;
+  payload: any;
+}
+
+@Injectable({
+  providedIn: 'root',
+})
+export class WebSocketConnectionService {
+  private socket: WebSocket | undefined;
+  private webSocketProto = 'wss';
+  private host = environment.apiUrl;
+  private wsUri = `${this.webSocketProto}://${this.host}/ws`;
+
+  public messages$ = new BehaviorSubject<string>('');
+  public systemMessages$ = new BehaviorSubject<string>('');
+  public signalMessages$ = new BehaviorSubject<any>(null);
+
+  constructor(private logger: LoggerService) {}
+
+  public connect(): Promise<void> {
+    return new Promise<void>((resolve, reject) => {
+      this.socket = new WebSocket(this.wsUri);
+
+      this.socket.onopen = () => {
+        this.logger.log('WebSocket connected');
+        resolve();
+      };
+
+      this.socket.onmessage = (ev) => {
+        if (typeof ev.data === 'string') {
+          const message = ev.data.trim();
+
+          if (message.startsWith('[SignalMessage]')) {
+            const signalMessage = JSON.parse(
+              message.replace('[SignalMessage]', '').trim()
+            );
+            this.signalMessages$.next(signalMessage);
+          } else if (this.isSystemMessage(message)) {
+            this.systemMessages$.next(message);
+          } else {
+            this.messages$.next(message);
+          }
+        }
+      };
+
+      this.socket.onclose = (event) => {
+        this.logger.log(
+          `WebSocket disconnected: code ${event.code}, reason ${event.reason}`
+        );
+        setTimeout(() => this.reconnect(), 1000);
+      };
+
+      this.socket.onerror = (error) => {
+        this.logger.log('WebSocket error: ' + error);
+        reject(error);
+      };
+    });
+  }
+
+  private reconnect() {
+    this.logger.log('Attempting to reconnect WebSocket...');
+    this.connect().catch((err) =>
+      console.error('WebSocket reconnection failed: ', err)
+    );
+  }
+
+  public send(message: string): void {
+    if (this.socket && this.socket.readyState === WebSocket.OPEN) {
+      this.socket.send(message);
+    } else {
+      this.logger.log('WebSocket is not open. Message not sent.');
+    }
+  }
+
+  public sendSignalMessage(message: any): void {
+    if (this.socket && this.socket.readyState === WebSocket.OPEN) {
+      const signalMessage = `[SignalMessage] ${JSON.stringify(message)}`;
+      this.socket.send(signalMessage);
+    }
+  }
+
+  private isSystemMessage(message: string): boolean {
+    return (
+      message.includes('[SystemMessage]') ||
+      message.includes('[SystemJoin]') ||
+      message.includes('[SystemRooms]') ||
+      message.includes('[SystemMembers]') ||
+      message.includes('[SystemName]')
+    );
+  }
+}
diff --git a/client/src/app/core/services/websocket.service.ts b/client/src/app/core/services/websocket.service.ts
deleted file mode 100644
index 118c2b4..0000000
--- a/client/src/app/core/services/websocket.service.ts
+++ /dev/null
@@ -1,393 +0,0 @@
-import { Injectable } from "@angular/core";
-import { BehaviorSubject } from "rxjs";
-import { environment } from "../../environments/environment";
-import { LoggerService } from "./logger.service";
-
-@Injectable({
-  providedIn: "root",
-})
-export class WebsocketService {
-  public message$ = new BehaviorSubject<string>("");
-  public rooms$ = new BehaviorSubject<string[]>([""]);
-  public members$ = new BehaviorSubject<string[]>([""]);
-  public uploadProgress$ = new BehaviorSubject<number>(0);
-  public downloadProgress$ = new BehaviorSubject<number>(0);
-
-  private socket: WebSocket | undefined;
-  private worker: Worker | undefined;
-  private fileChunks = new Map<string, { chunks: string[], totalChunks: number }>();
-
-  public user = "user";
-  private room = "main";
-
-  private webSocketProto = "wss";
-  private host = environment.apiUrl;
-
-  private CHUNK_SIZE = 32 * 1024;
-
-  private wsUri = `${this.webSocketProto}://${this.host}/ws`;
-
-  constructor(private logger: LoggerService) {}
-
-  public connect(): Promise<void> {
-    return new Promise<void>((resolve, reject) => {
-      this.socket = new WebSocket(this.wsUri);
-
-      this.socket.onopen = () => {
-        this.logger.log("Connected");
-        this.getUsername();
-        resolve();
-      };
-
-      this.socket.onmessage = (ev) => {
-        if (typeof ev.data === "string") {
-          const message = ev.data.trim();
-
-          if (this.isSystemMessage(message)) {
-            this.handleSystemMessage(message);
-          } else {
-            this.handleUserMessage(message);
-          }
-        } else if (ev.data instanceof Blob) {
-          const blob = ev.data;
-          this.logger.log(`Received attachment: ${blob.size} bytes`);
-          return;
-        }
-      };
-
-      this.socket.onclose = (event) => {
-        this.sendUserDisconnected();
-        this.logger.log(`Disconnected with code: ${event.code}, reason: ${event.reason}`);
-        setTimeout(() => this.reconnect(), 1000);
-      };
-
-      this.socket.onerror = (error) => {
-        this.logger.log("WebSocket Error: " + error);
-        reject(error);
-      };
-    });
-  }
-
-  private reconnect() {
-    this.logger.log("Attempting to reconnect...");
-    this.connect().catch((err) => console.error("Reconnection failed: ", err));
-  }
-
-  private sendUserDisconnected(): void {
-    if (this.socket && this.socket.readyState === WebSocket.OPEN) {
-      this.socket.send(`[UserDisconnected] ${this.user}`);
-      this.logger.log(`Sent disconnect notification for user: ${this.user}`);
-    }
-  }
-
-  private getUsername(): void {
-    if (this.socket && this.socket.readyState === WebSocket.OPEN) {
-      this.socket.send(`[UserCommand] /name`);
-      this.logger.log(`get username`);
-    }
-  }
-
-  public sendMessage(message: string): void {
-    if (
-      this.socket &&
-      this.socket.readyState === WebSocket.OPEN &&
-      message.trim()
-    ) {
-      this.logger.log(`${this.user}: ${message}`);
-      this.socket.send(message.trim());
-    } else {
-      this.logger.log(
-        "WebSocket is not open or message is empty. Ready state: " +
-          this.socket?.readyState
-        );
-    }
-  }
-
-  public sendAttachments(files: FileList | File[]): void {
-    if (this.socket && this.socket.readyState === WebSocket.OPEN) {
-      const fileArray = Array.isArray(files) ? files : Array.from(files);
-      const totalFiles = fileArray.length;
-      let currentFileIndex = 0;
-
-      const processNextFile = () => {
-        if (currentFileIndex < totalFiles) {
-          const file = fileArray[currentFileIndex];
-          if (!file) {
-            console.error(`File at index ${currentFileIndex} is undefined.`);
-            return;
-          }
-          this.logger.log( `Starting upload for file: ${file.name} (${file.size} bytes)`);
-          this.sendSingleFile(file, () => {
-            currentFileIndex++;
-            processNextFile();
-          });
-        }
-      };
-
-      processNextFile();
-    } else {
-      this.logger.log("WebSocket is not open. Ready state: " + this.socket?.readyState);
-    }
-  }
-
-  private sendSingleFile(file: File, callback: () => void): void {
-    const totalChunks = Math.ceil(file.size / this.CHUNK_SIZE);
-    let currentChunk = 0;
-
-    const sendNextChunk = () => {
-      const chunk = this.getChunk(file, currentChunk);
-      this.readAndSendChunk(
-        chunk,
-        currentChunk,
-        totalChunks,
-        file.name,
-        file.type,
-        () => {
-          currentChunk++;
-          if (currentChunk < totalChunks) {
-            const progress = Math.floor((currentChunk / totalChunks) * 100);
-            this.uploadProgress$.next(progress);
-            sendNextChunk();
-          } else {
-            this.uploadProgress$.next(100);
-            this.logger.log(`File sent: ${file.name}`);
-            this.resetProgressAfterDelay();
-            callback();
-          }
-        }
-      );
-    };
-
-    sendNextChunk();
-  }
-
-  private getChunk(file: File, currentChunk: number): Blob {
-    const start = currentChunk * this.CHUNK_SIZE;
-    const end = Math.min(file.size, start + this.CHUNK_SIZE);
-    return file.slice(start, end);
-  }
-
-  private readAndSendChunk(
-    chunk: Blob,
-    currentChunk: number,
-    totalChunks: number,
-    fileName: string,
-    mimeType: string,
-    callback: () => void
-  ): void {
-    const reader = new FileReader();
-    reader.onload = () => {
-      if (reader.result instanceof ArrayBuffer === false) {
-        console.error("Failed to read file chunk");
-        return;
-      }
-      const arrayBuffer = reader.result as ArrayBuffer;
-      const combinedBuffer = this.createCombinedBuffer(
-        arrayBuffer,
-        fileName,
-        mimeType,
-        currentChunk,
-        totalChunks
-      );
-      this.socket?.send(combinedBuffer);
-      callback();
-    };
-    reader.readAsArrayBuffer(chunk);
-  }
-
-  private createCombinedBuffer(
-    arrayBuffer: ArrayBuffer,
-    fileName: string,
-    mimeType: string,
-    currentChunk: number,
-    totalChunks: number
-  ): Uint8Array {
-    const metadata = JSON.stringify({
-      file_name: fileName,
-      mime_type: mimeType || "application/octet-stream",
-      total_chunks: totalChunks,
-      current_chunk: currentChunk,
-    });
-
-    const metadataBuffer = new TextEncoder().encode(metadata);
-    const delimiter = new Uint8Array([0]);
-
-    const combinedBuffer = new Uint8Array(
-      metadataBuffer.byteLength + delimiter.byteLength + arrayBuffer.byteLength
-    );
-
-    combinedBuffer.set(metadataBuffer, 0);
-    combinedBuffer.set(delimiter, metadataBuffer.byteLength);
-    combinedBuffer.set(
-      new Uint8Array(arrayBuffer),
-      metadataBuffer.byteLength + delimiter.byteLength
-    );
-
-    return combinedBuffer;
-  }
-
-  private resetProgressAfterDelay(): void {
-    setTimeout(() => {
-      this.uploadProgress$.next(0);
-      this.downloadProgress$.next(0);
-    }, 2000);
-  }
-
-  public listRooms(): void {
-    if (this.socket && this.socket.readyState === WebSocket.OPEN) {
-      const message = "[UserCommand] /list";
-      this.socket.send(message);
-    } else {
-      this.logger.log("WebSocket is not open. Ready state: " + this.socket?.readyState);
-    }
-  }
-
-  public joinRoom(room: string): void {
-    if (this.socket && this.socket.readyState === WebSocket.OPEN) {
-      this.message$.next(`Leaving room: ${this.room}, joining room: ${room}`);
-      const message = `[UserCommand] /join ${room}`;
-      this.socket.send(message);
-    } else {
-      this.logger.log("WebSocket is not open. Ready state: " + this.socket?.readyState);
-    }
-  }
-
-  private isSystemMessage(message: string): boolean {
-    return (
-      message.includes("[SystemMessage]") ||
-      message.includes("[SystemJoin]") ||
-      message.includes("[SystemRooms]") ||
-      message.includes("[SystemFile]") ||
-      message.includes("[SystemFileChunk]") ||
-      message.includes("[SystemAck]") ||
-      message.includes("[SystemMembers]") ||
-      message.includes("[SystemName]")
-    );
-  }
-
-  private handleSystemMessage(message: string): void {
-    if (message.startsWith("[SystemAck]:")) {
-      this.logger.log("Received ack from server");
-      this.message$.next("File uploaded successfully");
-      return;
-    }
-
-    const matchName = message.match(/\[SystemName\]\s*:\s*(.*?)$/);
-    if (matchName && matchName[1]) {
-      const userName = matchName[1].trim();
-      this.logger.log(`Username updated from: ${this.user}, to: ${userName}`);
-      this.user = userName;
-      return;
-    }
-
-    const matchJoin = message.match(/^(.*?)\s*\[SystemJoin\]\s*(.*?)$/);
-    if (matchJoin) {
-      this.logger.log(`User joined room ${matchJoin[2]}`);
-      this.room = matchJoin[2];
-      return;
-    }
-
-    const matchRooms = message.match(/\[SystemRooms\]:\s*(.*?)$/);
-    if (matchRooms) {
-      this.logger.log(`Rooms: ${matchRooms[1]}`);
-      this.rooms$.next(
-        matchRooms[1].split(",").map((room: string) => room.trim())
-      );
-      return;
-    }
-
-    const matchMeber = message.match(/\[SystemMembers\]:\s*(.*?)$/);
-    if (matchMeber) {
-      this.logger.log(`Members: ${matchMeber[1]}`);
-      this.members$.next(
-        matchMeber[1].split(",").map((room: string) => room.trim())
-      );
-      return;
-    }
-
-    const matchFileChunk = message.match(/\[SystemFileChunk\]:(.*?):(.*?):(\d+):(\d+):(.+)/);
-    if (matchFileChunk) {
-      this.logger.log("Received file chunk");
-      const fileName = matchFileChunk[1];
-      const mimeType = matchFileChunk[2];
-      const currentChunk = parseInt(matchFileChunk[3], 10);
-      const totalChunks = parseInt(matchFileChunk[4], 10);
-      const base64Data = matchFileChunk[5];
-
-      this.receiveFileChunk(fileName, mimeType, currentChunk, totalChunks, base64Data);
-      return;
-    }
-
-    const matchSystemError = message.replace(/^\[SystemError\]\s*/, "");
-    if (matchSystemError) {
-      this.logger.log(`System Error: ${matchSystemError}`);
-      console.error(`System Error: ${matchSystemError}`);
-      return;
-    }
-
-    console.error("Unhandled system message:", message);
-  }
-
-  private receiveFileChunk(
-    fileName: string,
-    mimeType: string,
-    currentChunk: number,
-    totalChunks: number,
-    base64Data: string
-  ): void {
-    if (!this.fileChunks.has(fileName)) {
-      this.fileChunks.set(fileName, { chunks: new Array(totalChunks), totalChunks });
-    }
-
-    const fileData = this.fileChunks.get(fileName);
-    if (!fileData) return;
-
-    fileData.chunks[currentChunk - 1] = base64Data;
-    this.logger.log(`Received chunk ${currentChunk}/${totalChunks} for file: ${fileName}`);
-
-    const receivedChunksCount = fileData.chunks.filter(chunk => !!chunk).length;
-    const progress = Math.floor((receivedChunksCount / totalChunks) * 100);
-    this.downloadProgress$.next(progress);
-
-    if (fileData.chunks.filter(chunk => !!chunk).length === totalChunks) {
-      this.logger.log(`All chunks received for file: ${fileName}. Reassembling...`);
-      this.assembleAndDownloadFile(fileName, mimeType, fileData.chunks);
-      this.fileChunks.delete(fileName);
-      this.downloadProgress$.next(100);
-
-      this.resetProgressAfterDelay();
-    }
-  }
-
-  private assembleAndDownloadFile(fileName: string, mimeType: string, chunks: string[]): void {
-    const byteArrays = chunks.map(chunk => {
-      const binaryString = atob(chunk);
-      const len = binaryString.length;
-      const bytes = new Uint8Array(len);
-      for (let i = 0; i < len; i++) {
-        bytes[i] = binaryString.charCodeAt(i);
-      }
-      return bytes;
-    });
-
-    const blob = new Blob(byteArrays, { type: mimeType });
-
-    const link = document.createElement("a");
-    link.href = URL.createObjectURL(blob);
-    link.download = fileName;
-    link.textContent = `${fileName} [click to download]`;
-    link.style.display = "block";
-    link.style.margin = "10px 0";
-
-    const linkContainer = document.createElement("div");
-    linkContainer.appendChild(link);
-
-    this.message$.next(linkContainer.innerHTML);
-  }
-
-  private handleUserMessage(message: string): void {
-    if (message.trim()) {
-      this.message$.next(`${message}`);
-    }
-  }
-}

From df641dd8aff7bb632e5cd751bd24930cbfa4ec33 Mon Sep 17 00:00:00 2001
From: Sulaiman AlRomaih <xSloMxSA@gmail.com>
Date: Sun, 20 Oct 2024 15:11:08 +0300
Subject: [PATCH 04/12] Create WebRTC service.

- This will handle the signaling and sending the attachments along with the messages.
---
 .../app/core/services/webrtc.service.spec.ts  |  16 +
 .../src/app/core/services/webrtc.service.ts   | 375 ++++++++++++++++++
 2 files changed, 391 insertions(+)
 create mode 100644 client/src/app/core/services/webrtc.service.spec.ts
 create mode 100644 client/src/app/core/services/webrtc.service.ts

diff --git a/client/src/app/core/services/webrtc.service.spec.ts b/client/src/app/core/services/webrtc.service.spec.ts
new file mode 100644
index 0000000..8d8e6aa
--- /dev/null
+++ b/client/src/app/core/services/webrtc.service.spec.ts
@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { WebrtcService } from './webrtc.service';
+
+describe('WebrtcService', () => {
+  let service: WebrtcService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(WebrtcService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});
diff --git a/client/src/app/core/services/webrtc.service.ts b/client/src/app/core/services/webrtc.service.ts
new file mode 100644
index 0000000..335bf77
--- /dev/null
+++ b/client/src/app/core/services/webrtc.service.ts
@@ -0,0 +1,375 @@
+import { Injectable } from '@angular/core';
+import { BehaviorSubject, Subject } from 'rxjs';
+import { LoggerService } from './logger.service';
+import { WebSocketConnectionService } from './websocket-connection.service';
+import { UserService } from './user.service';
+
+interface SignalMessage {
+  type: 'offer' | 'answer' | 'candidate';
+  data: any;
+  from: string;
+  to: string;
+}
+
+interface DataChannelMessage {
+  type: string;
+  payload: any;
+}
+
+@Injectable({
+  providedIn: 'root',
+})
+export class WebRTCService {
+  public dataChannelOpen$ = new BehaviorSubject<boolean>(false);
+
+  public chatMessages$ = new Subject<string>();
+  public fileOffers$ = new Subject<{ fileName: string; fileSize: number; fromUser: string }>();
+  public fileResponses$ = new Subject<{ accepted: boolean; fromUser: string }>();
+  public incomingData$ = new Subject<ArrayBuffer>();
+  public bufferedAmountLow$ = new Subject<void>();
+
+  private peerConnections = new Map<string, RTCPeerConnection>();
+  private dataChannels = new Map<string, RTCDataChannel>();
+  private candidateQueues = new Map<string, RTCIceCandidateInit[]>();
+  private messageQueues = new Map<string, (DataChannelMessage | ArrayBuffer)[]>();
+
+  constructor(
+    private logger: LoggerService,
+    private wsService: WebSocketConnectionService,
+    private userService: UserService
+  ) {
+    this.wsService.signalMessages$.subscribe((message) => {
+      if (message) {
+        this.handleSignalMessage(message);
+      }
+    });
+  }
+
+  public initiateConnection(targetUser: string): void {
+    if (this.peerConnections.has(targetUser)) {
+      this.logger.log(`PeerConnection with ${targetUser} already exists.`);
+      return;
+    }
+
+    this.logger.log(`Initiating connection with ${targetUser}`);
+
+    const peerConnection = this.createPeerConnection(targetUser);
+    const dataChannel = peerConnection.createDataChannel('data');
+    this.setupDataChannel(dataChannel, targetUser);
+    this.dataChannels.set(targetUser, dataChannel);
+
+    peerConnection
+      .createOffer()
+      .then((offer) => peerConnection.setLocalDescription(offer))
+      .then(() => {
+        const message: SignalMessage = {
+          type: 'offer',
+          data: peerConnection.localDescription,
+          from: this.userService.user,
+          to: targetUser,
+        };
+        this.wsService.sendSignalMessage(message);
+      })
+      .catch((error) => {
+        console.error('Error during offer creation:', error);
+      });
+  }
+
+  private createPeerConnection(targetUser: string): RTCPeerConnection {
+    const configuration = {
+      iceServers: [{ urls: 'stun:stun.l.google.com:19302' }],
+    };
+
+    const peerConnection = new RTCPeerConnection(configuration);
+
+    peerConnection.onicecandidate = (event) => {
+      if (event.candidate) {
+        const message: SignalMessage = {
+          type: 'candidate',
+          data: event.candidate,
+          from: this.userService.user,
+          to: targetUser,
+        };
+        this.wsService.sendSignalMessage(message);
+      }
+    };
+
+    peerConnection.ondatachannel = (event) => {
+      const dataChannel = event.channel;
+      this.setupDataChannel(dataChannel, targetUser);
+      this.dataChannels.set(targetUser, dataChannel);
+    };
+
+    peerConnection.onconnectionstatechange = () => {
+      this.logger.log(
+        `Connection state with ${targetUser} changed: ${peerConnection.connectionState}`
+      );
+    };
+
+    this.peerConnections.set(targetUser, peerConnection);
+    this.candidateQueues.set(targetUser, []);
+
+    return peerConnection;
+  }
+
+  private setupDataChannel(channel: RTCDataChannel, targetUser: string): void {
+    channel.onopen = () => {
+      this.logger.log(`Data channel with ${targetUser} is open`);
+      this.dataChannelOpen$.next(true);
+
+      const queuedMessages = this.messageQueues.get(targetUser);
+      if (queuedMessages && queuedMessages.length > 0) {
+        queuedMessages.forEach((msg) => {
+          if (typeof msg === 'object' && !(msg instanceof ArrayBuffer)) {
+            channel.send(JSON.stringify(msg));
+          } else if (msg instanceof ArrayBuffer) {
+            channel.send(msg);
+          }
+        });
+        this.messageQueues.set(targetUser, []);
+      }
+    };
+
+    channel.onmessage = (event) => {
+      this.handleDataChannelMessage(event.data, targetUser);
+    };
+
+    channel.onerror = (error) => {
+      console.error(`Data Channel Error with ${targetUser}:`, error);
+    };
+
+    channel.onclose = () => {
+      this.logger.log(`Data channel with ${targetUser} is closed`);
+      this.dataChannelOpen$.next(false);
+
+      this.dataChannels.delete(targetUser);
+      const peerConnection = this.peerConnections.get(targetUser);
+      if (peerConnection) {
+        peerConnection.close();
+        this.peerConnections.delete(targetUser);
+      }
+    };
+
+    channel.bufferedAmountLowThreshold = 128 * 1024; // 128 KB
+    channel.onbufferedamountlow = () => {
+      this.bufferedAmountLow$.next();
+    };
+  }
+
+  private handleDataChannelMessage(data: any, targetUser: string): void {
+    if (typeof data === 'string') {
+      const message: DataChannelMessage = JSON.parse(data);
+      switch (message.type) {
+        case 'chat':
+          this.chatMessages$.next(message.payload);
+          break;
+        case 'file-offer':
+          this.logger.log(`Received file offer from ${targetUser}`);
+          this.fileOffers$.next({
+            fileName: message.payload.fileName,
+            fileSize: message.payload.fileSize,
+            fromUser: targetUser,
+          });
+          break;
+        case 'file-accept':
+          this.logger.log(`Received file acceptance from ${targetUser}`);
+          this.fileResponses$.next({ accepted: true, fromUser: targetUser });
+          break;
+        case 'file-decline':
+          this.logger.log(`Received file decline from ${targetUser}`);
+          this.fileResponses$.next({ accepted: false, fromUser: targetUser });
+          break;
+        default:
+          console.warn('Unknown message type:', message.type);
+      }
+    } else if (data instanceof ArrayBuffer) {
+      this.incomingData$.next(data);
+    }
+  }
+
+  public sendData(message: DataChannelMessage, targetUser: string): void {
+    const channel = this.dataChannels.get(targetUser);
+
+    if (channel && channel.readyState === 'open') {
+      channel.send(JSON.stringify(message));
+    } else if (channel && channel.readyState === 'connecting') {
+      console.warn(`Data channel with ${targetUser} is connecting. Message will be queued.`);
+
+      if (!this.messageQueues.has(targetUser)) {
+        this.messageQueues.set(targetUser, []);
+      }
+      this.messageQueues.get(targetUser)!.push(message);
+    } else {
+      console.error(`Data channel with ${targetUser} is not open`);
+
+      if (channel) {
+        this.dataChannels.delete(targetUser);
+      }
+      const peerConnection = this.peerConnections.get(targetUser);
+      if (peerConnection) {
+        peerConnection.close();
+        this.peerConnections.delete(targetUser);
+      }
+
+      if (!this.messageQueues.has(targetUser)) {
+        this.messageQueues.set(targetUser, []);
+      }
+      this.messageQueues.get(targetUser)!.push(message);
+      this.initiateConnection(targetUser);
+    }
+  }
+
+  public sendRawData(data: ArrayBuffer, targetUser: string): void {
+    const channel = this.dataChannels.get(targetUser);
+
+    if (channel && channel.readyState === 'open') {
+      channel.send(data);
+    } else if (channel && channel.readyState === 'connecting') {
+      console.warn(`Data channel with ${targetUser} is connecting. Data will be queued.`);
+      if (!this.messageQueues.has(targetUser)) {
+        this.messageQueues.set(targetUser, []);
+      }
+      this.messageQueues.get(targetUser)!.push(data);
+    } else {
+      console.error(`Data channel with ${targetUser} is not open`);
+
+      if (channel) {
+        this.dataChannels.delete(targetUser);
+      }
+      const peerConnection = this.peerConnections.get(targetUser);
+      if (peerConnection) {
+        peerConnection.close();
+        this.peerConnections.delete(targetUser);
+      }
+
+      if (!this.messageQueues.has(targetUser)) {
+        this.messageQueues.set(targetUser, []);
+      }
+      this.messageQueues.get(targetUser)!.push(data);
+      this.initiateConnection(targetUser);
+    }
+  }
+
+  public getDataChannel(targetUser: string): RTCDataChannel | null {
+    return this.dataChannels.get(targetUser) || null;
+  }
+
+  public isConnected(targetUser: string): boolean {
+    const channel = this.dataChannels.get(targetUser);
+    return channel?.readyState === 'open';
+  }
+
+  private handleSignalMessage(message: SignalMessage): void {
+    if (message.to !== this.userService.user) {
+      return;
+    }
+
+    switch (message.type) {
+      case 'offer':
+        this.handleOffer(message);
+        break;
+      case 'answer':
+        this.handleAnswer(message);
+        break;
+      case 'candidate':
+        this.handleCandidate(message);
+        break;
+      default:
+        console.error('Unknown signal message type:', message.type);
+    }
+  }
+
+  private handleOffer(message: SignalMessage): void {
+    const targetUser = message.from;
+    const peerConnection = this.createPeerConnection(targetUser);
+
+    peerConnection
+      .setRemoteDescription(new RTCSessionDescription(message.data))
+      .then(() => {
+        return peerConnection.createAnswer();
+      })
+      .then((answer) => {
+        return peerConnection.setLocalDescription(answer);
+      })
+      .then(() => {
+        const response: SignalMessage = {
+          type: 'answer',
+          data: peerConnection.localDescription,
+          from: this.userService.user,
+          to: targetUser,
+        };
+        this.wsService.sendSignalMessage(response);
+        this.processCandidateQueue(targetUser);
+      })
+      .catch((error) => {
+        console.error('Error handling offer:', error);
+      });
+  }
+
+  private handleAnswer(message: SignalMessage): void {
+    const targetUser = message.from;
+    const peerConnection = this.peerConnections.get(targetUser);
+
+    if (!peerConnection) {
+      console.error('PeerConnection does not exist for user:', targetUser);
+      return;
+    }
+
+    peerConnection
+      .setRemoteDescription(new RTCSessionDescription(message.data))
+      .then(() => {
+        this.processCandidateQueue(targetUser);
+      })
+      .catch((error) => {
+        console.error('Error setting remote description:', error);
+      });
+  }
+
+  private handleCandidate(message: SignalMessage): void {
+    const targetUser = message.from;
+    const candidate = new RTCIceCandidate(message.data);
+    const peerConnection = this.peerConnections.get(targetUser);
+
+    if (peerConnection?.remoteDescription?.type) {
+      peerConnection
+        .addIceCandidate(candidate)
+        .catch((error) => {
+          console.error('Error adding received ICE candidate', error);
+        });
+    } else {
+      const queue = this.candidateQueues.get(targetUser);
+      if (queue) {
+        queue.push(message.data);
+      }
+    }
+  }
+
+  private processCandidateQueue(targetUser: string): void {
+    const queue = this.candidateQueues.get(targetUser);
+    const peerConnection = this.peerConnections.get(targetUser);
+
+    if (queue && peerConnection) {
+      queue.forEach((candidateInit) => {
+        const candidate = new RTCIceCandidate(candidateInit);
+        peerConnection
+          .addIceCandidate(candidate)
+          .catch((error) => {
+            console.error('Error adding queued ICE candidate', error);
+          });
+      });
+      queue.length = 0;
+    }
+  }
+
+  public closeAllConnections(): void {
+    this.dataChannels.forEach((channel) => {
+      channel.close();
+    });
+    this.peerConnections.forEach((peerConnection) => {
+      peerConnection.close();
+    });
+    this.dataChannels.clear();
+    this.peerConnections.clear();
+    this.candidateQueues.clear();
+  }
+}

From 0817034db53580d3e35cf1867477e441ded4e6d5 Mon Sep 17 00:00:00 2001
From: Sulaiman AlRomaih <xSloMxSA@gmail.com>
Date: Sun, 20 Oct 2024 15:12:00 +0300
Subject: [PATCH 05/12] Create user service.

- Handle the user name.
---
 client/src/app/core/services/theme.service.ts |  3 +++
 .../app/core/services/user.service.spec.ts    | 16 +++++++++++++++
 client/src/app/core/services/user.service.ts  | 20 +++++++++++++++++++
 3 files changed, 39 insertions(+)
 create mode 100644 client/src/app/core/services/user.service.spec.ts
 create mode 100644 client/src/app/core/services/user.service.ts

diff --git a/client/src/app/core/services/theme.service.ts b/client/src/app/core/services/theme.service.ts
index 727baad..0fcdd67 100644
--- a/client/src/app/core/services/theme.service.ts
+++ b/client/src/app/core/services/theme.service.ts
@@ -29,6 +29,9 @@ export class ThemeService {
   }
 
   private applyTheme(themePreference: string | null): void {
+    if (!themePreference) {
+      return;
+    }
     document.body.classList.toggle('dark-mode', themePreference === 'dark');
     document.body.classList.toggle('light-mode', themePreference !== 'dark');
   }
diff --git a/client/src/app/core/services/user.service.spec.ts b/client/src/app/core/services/user.service.spec.ts
new file mode 100644
index 0000000..3f804c9
--- /dev/null
+++ b/client/src/app/core/services/user.service.spec.ts
@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { UserService } from './user.service';
+
+describe('UserService', () => {
+  let service: UserService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(UserService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});
diff --git a/client/src/app/core/services/user.service.ts b/client/src/app/core/services/user.service.ts
new file mode 100644
index 0000000..787ae9c
--- /dev/null
+++ b/client/src/app/core/services/user.service.ts
@@ -0,0 +1,20 @@
+import { Injectable } from '@angular/core';
+import { BehaviorSubject } from 'rxjs';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class UserService {
+  private userSubject = new BehaviorSubject<string>('');
+  public user$ = this.userSubject.asObservable();
+
+  constructor() {}
+
+  public get user(): string {
+    return this.userSubject.value;
+  }
+
+  public set user(value: string) {
+    this.userSubject.next(value);
+  }
+}

From da2c61092568e518026f631b1ebbfbf9c107bb9d Mon Sep 17 00:00:00 2001
From: Sulaiman AlRomaih <xSloMxSA@gmail.com>
Date: Sun, 20 Oct 2024 15:13:33 +0300
Subject: [PATCH 06/12] Create room service.

- This will handle all the room (channels) related services from the WebSocket.
---
 .../app/core/services/room.service.spec.ts    | 16 ++++++
 client/src/app/core/services/room.service.ts  | 56 +++++++++++++++++++
 2 files changed, 72 insertions(+)
 create mode 100644 client/src/app/core/services/room.service.spec.ts
 create mode 100644 client/src/app/core/services/room.service.ts

diff --git a/client/src/app/core/services/room.service.spec.ts b/client/src/app/core/services/room.service.spec.ts
new file mode 100644
index 0000000..34729eb
--- /dev/null
+++ b/client/src/app/core/services/room.service.spec.ts
@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { RoomService } from './room.service';
+
+describe('RoomService', () => {
+  let service: RoomService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(RoomService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});
diff --git a/client/src/app/core/services/room.service.ts b/client/src/app/core/services/room.service.ts
new file mode 100644
index 0000000..9d93a3b
--- /dev/null
+++ b/client/src/app/core/services/room.service.ts
@@ -0,0 +1,56 @@
+import { Injectable } from '@angular/core';
+import { BehaviorSubject } from 'rxjs';
+import { LoggerService } from './logger.service';
+import { WebSocketConnectionService } from './websocket-connection.service';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class RoomService {
+  public rooms$ = new BehaviorSubject<string[]>([]);
+  public members$ = new BehaviorSubject<string[]>([]);
+  public currentRoom = 'main';
+
+  constructor(
+    private logger: LoggerService,
+    private wsService: WebSocketConnectionService
+  ) {
+    this.wsService.systemMessages$.subscribe((message) => {
+      this.handleSystemMessage(message);
+    });
+  }
+
+  public listRooms(): void {
+    this.logger.log('Listing rooms');
+    this.wsService.send('[UserCommand] /list');
+  }
+
+  public joinRoom(room: string): void {
+    if (room !== this.currentRoom) {
+      this.wsService.send(`[UserCommand] /join ${room}`);
+      this.currentRoom = room;
+    }
+  }
+
+  private handleSystemMessage(message: string): void {
+    if (message.includes('[SystemRooms]')) {
+      const matchRooms = message.match(/\[SystemRooms\]:\s*(.*?)$/);
+      if (matchRooms) {
+        const rooms = matchRooms[1].split(',').map((room: string) => room.trim());
+        this.rooms$.next(rooms);
+      }
+    } else if (message.includes('[SystemMembers]')) {
+      const matchMembers = message.match(/\[SystemMembers\]:\s*(.*?)$/);
+      if (matchMembers) {
+        const members = matchMembers[1].split(',').map((member: string) => member.trim());
+        this.members$.next(members);
+      }
+    } else if (message.includes('[SystemJoin]')) {
+      const matchJoin = message.match(/^(.*?)\s*\[SystemJoin\]\s*(.*?)$/);
+      if (matchJoin) {
+        this.logger.log(`User joined room ${matchJoin[2]}`);
+        this.currentRoom = matchJoin[2];
+      }
+    }
+  }
+}

From ecfcaaf9e8e5d7b7d7b3130cfdeb42c5ebf50b2a Mon Sep 17 00:00:00 2001
From: Sulaiman AlRomaih <xSloMxSA@gmail.com>
Date: Sun, 20 Oct 2024 15:16:41 +0300
Subject: [PATCH 07/12] Create Chat Service.

- We will handle all the chat related services such as sending messages, getting the user name and system messages.
---
 ...t.service.spec.ts => chat.service.spec.ts} |  8 +--
 client/src/app/core/services/chat.service.ts  | 69 +++++++++++++++++++
 2 files changed, 73 insertions(+), 4 deletions(-)
 rename client/src/app/core/services/{websocket.service.spec.ts => chat.service.spec.ts} (53%)
 create mode 100644 client/src/app/core/services/chat.service.ts

diff --git a/client/src/app/core/services/websocket.service.spec.ts b/client/src/app/core/services/chat.service.spec.ts
similarity index 53%
rename from client/src/app/core/services/websocket.service.spec.ts
rename to client/src/app/core/services/chat.service.spec.ts
index bf79772..08baf52 100644
--- a/client/src/app/core/services/websocket.service.spec.ts
+++ b/client/src/app/core/services/chat.service.spec.ts
@@ -1,13 +1,13 @@
 import { TestBed } from '@angular/core/testing';
 
-import { WebsocketService } from './websocket.service';
+import { ChatService } from './chat.service';
 
-describe('WebsocketService', () => {
-  let service: WebsocketService;
+describe('FileTransferService', () => {
+  let service: ChatService;
 
   beforeEach(() => {
     TestBed.configureTestingModule({});
-    service = TestBed.inject(WebsocketService);
+    service = TestBed.inject(ChatService);
   });
 
   it('should be created', () => {
diff --git a/client/src/app/core/services/chat.service.ts b/client/src/app/core/services/chat.service.ts
new file mode 100644
index 0000000..e550dc0
--- /dev/null
+++ b/client/src/app/core/services/chat.service.ts
@@ -0,0 +1,69 @@
+import { Injectable } from '@angular/core';
+import { BehaviorSubject } from 'rxjs';
+import { LoggerService } from './logger.service';
+import { WebSocketConnectionService } from './websocket-connection.service';
+import { WebRTCService } from './webrtc.service';
+import { UserService } from './user.service';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class ChatService {
+  public messages$ = new BehaviorSubject<string[]>([]);
+  private messages: string[] = [];
+
+  constructor(
+    private logger: LoggerService,
+    private wsService: WebSocketConnectionService,
+    private webrtcService: WebRTCService,
+    private userService: UserService
+  ) {
+    this.webrtcService.chatMessages$.subscribe((message) => {
+      this.handleUserMessage(message);
+    });
+
+    this.wsService.systemMessages$.subscribe((message) => {
+      this.handleSystemMessage(message);
+    });
+  }
+
+  public get user(): string {
+    return this.userService.user;
+  }
+
+  public set user(value: string) {
+    this.userService.user = value;
+  }
+
+  public sendMessage(content: string, targetUser: string): void {
+    if (content.trim()) {
+      const message = {
+        type: 'chat',
+        payload: `${this.user}: ${content.trim()}`,
+      };
+      this.webrtcService.sendData(message, targetUser);
+      this.messages.push(`${this.user}: ${content.trim()}`);
+      this.messages$.next(this.messages);
+    }
+  }
+
+  private handleUserMessage(message: string): void {
+    this.messages.push(message);
+    this.messages$.next(this.messages);
+  }
+
+  private handleSystemMessage(message: string): void {
+    if (message.includes('[SystemName]')) {
+      const matchName = message.match(/\[SystemName\]\s*:\s*(.*?)$/);
+      if (matchName && matchName[1]) {
+        const userName = matchName[1].trim();
+        this.logger.log(`Username updated from: ${this.user}, to: ${userName}`);
+        this.user = userName;
+      }
+    }
+  }
+
+  public getUsername(): void {
+    this.wsService.send('[UserCommand] /name');
+  }
+}

From ff83207e621512f3f3b42ac3274d931abe2be3f0 Mon Sep 17 00:00:00 2001
From: Sulaiman AlRomaih <xSloMxSA@gmail.com>
Date: Sun, 20 Oct 2024 15:37:22 +0300
Subject: [PATCH 08/12] Create file service.

- Here we will handle the attachments sending and receiving along with the accept signal's and declines.
---
 .../services/file-transfer.service.spec.ts    |  16 ++
 .../core/services/file-transfer.service.ts    | 213 ++++++++++++++++++
 2 files changed, 229 insertions(+)
 create mode 100644 client/src/app/core/services/file-transfer.service.spec.ts
 create mode 100644 client/src/app/core/services/file-transfer.service.ts

diff --git a/client/src/app/core/services/file-transfer.service.spec.ts b/client/src/app/core/services/file-transfer.service.spec.ts
new file mode 100644
index 0000000..22c8d99
--- /dev/null
+++ b/client/src/app/core/services/file-transfer.service.spec.ts
@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { FileTransferService } from './file-transfer.service';
+
+describe('FileTransferService', () => {
+  let service: FileTransferService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(FileTransferService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});
diff --git a/client/src/app/core/services/file-transfer.service.ts b/client/src/app/core/services/file-transfer.service.ts
new file mode 100644
index 0000000..1ff5005
--- /dev/null
+++ b/client/src/app/core/services/file-transfer.service.ts
@@ -0,0 +1,213 @@
+import { Injectable } from '@angular/core';
+import { BehaviorSubject } from 'rxjs';
+import { LoggerService } from './logger.service';
+import { WebRTCService } from './webrtc.service';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class FileTransferService {
+  public uploadProgress$ = new BehaviorSubject<number>(0);
+  public downloadProgress$ = new BehaviorSubject<number>(0);
+  public incomingFile$ = new BehaviorSubject<{ fileName: string; fileSize: number; fromUser: string } | null>(null);
+
+  private fileToSend: File | null = null;
+  private targetUser = '';
+  private receivedSize = 0;
+  private dataQueue: ArrayBuffer[] = [];
+  private isPaused = false;
+  private incomingFileSize = 0;
+  private isReceivingFile = false;
+
+  private readonly CHUNK_SIZE = 32 * 1024;
+  private readonly MAX_BUFFERED_AMOUNT = 256 * 1024;
+
+  constructor(
+    private logger: LoggerService,
+    private webrtcService: WebRTCService
+  ) {
+    this.webrtcService.incomingData$.subscribe(async (data) => {
+      if (data instanceof ArrayBuffer) {
+        await this.handleDataChunk(data);
+      }
+    });
+
+    this.webrtcService.fileOffers$.subscribe((offer) => {
+      this.logger.log(`Received file offer from ${offer.fromUser}`);
+      this.incomingFile$.next({
+        fileName: offer.fileName,
+        fileSize: offer.fileSize,
+        fromUser: offer.fromUser,
+      });
+    });
+
+    this.webrtcService.fileResponses$.subscribe((response) => {
+      if (response.accepted) {
+        this.logger.log(`File accepted by ${response.fromUser}`);
+        this.startSendingFile(response.fromUser);
+      } else {
+        this.logger.log(`File declined by ${response.fromUser}`);
+        alert('The receiver declined the file transfer.');
+      }
+    });
+
+    this.webrtcService.bufferedAmountLow$.subscribe(() => {
+      if (this.isPaused) {
+        this.isPaused = false;
+        this.sendNextChunk(this.targetUser);
+      }
+    });
+  }
+
+  public prepareFileForSending(file: File, targetUser: string): void {
+    this.fileToSend = file;
+    this.targetUser = targetUser;
+  }
+
+  public sendFileOffer(): void {
+    if (!this.fileToSend) {
+      console.error('No file to send.');
+      return;
+    }
+    this.logger.log(`Sending file offer to ${this.targetUser}`);
+    const message = {
+      type: 'file-offer',
+      payload: {
+        fileName: this.fileToSend.name,
+        fileSize: this.fileToSend.size,
+      },
+    };
+    this.webrtcService.sendData(message, this.targetUser);
+  }
+
+  public startSavingFile(): void {
+    if (!this.incomingFile$.value) {
+      console.error('No incoming file to accept.');
+      return;
+    }
+
+    const { fromUser, fileSize } = this.incomingFile$.value;
+    this.incomingFileSize = fileSize;
+    this.isReceivingFile = true;
+
+    const message = {
+      type: 'file-accept',
+      payload: {},
+    };
+
+    this.logger.log(`Sending file acceptance to ${fromUser}`);
+
+    this.webrtcService.sendData(message, fromUser);
+    this.receivedSize = 0;
+    this.dataQueue = [];
+  }
+
+  private async handleDataChunk(data: ArrayBuffer): Promise<void> {
+    if (!this.isReceivingFile) {
+      this.logger.log('Received data chunk when not expecting a file transfer. Ignoring.');
+      return;
+    }
+
+    this.dataQueue.push(data);
+    this.receivedSize += data.byteLength;
+    const fileSize = this.incomingFileSize;
+
+    if (!fileSize) {
+      console.error('Invalid file size.');
+      return;
+    }
+
+    const progress = (this.receivedSize / fileSize) * 100;
+    if (isFinite(progress)) {
+      this.downloadProgress$.next(parseFloat(progress.toFixed(2)));
+    } else {
+      console.error('Progress is non-finite');
+      return;
+    }
+
+    if (this.receivedSize >= fileSize) {
+      this.logger.log('File received successfully');
+      const receivedBlob = new Blob(this.dataQueue);
+      const downloadUrl = URL.createObjectURL(receivedBlob);
+      const fileName = this.incomingFile$.value?.fileName || 'downloaded_file';
+
+      const anchor = document.createElement('a');
+      anchor.href = downloadUrl;
+      anchor.download = fileName;
+      anchor.click();
+
+      this.downloadProgress$.next(100);
+      this.resetProgressAfterDelay();
+      this.incomingFile$.next(null);
+      this.dataQueue = [];
+      this.receivedSize = 0;
+      this.incomingFileSize = 0;
+      this.isReceivingFile = false;
+    }
+  }
+
+  private startSendingFile(targetUser: string): void {
+    if (!this.fileToSend) {
+      console.error('No file to send.');
+      return;
+    }
+    this.logger.log(`Starting to send file to ${targetUser}`);
+    this.sendNextChunk(targetUser);
+  }
+
+  private sendNextChunk(targetUser: string): void {
+    if (this.isPaused || !this.fileToSend) return;
+
+    const dataChannel = this.webrtcService.getDataChannel(targetUser);
+    if (!dataChannel) {
+      console.error(`Data channel is not available for ${targetUser}`);
+      return;
+    }
+
+    if (dataChannel.bufferedAmount > this.MAX_BUFFERED_AMOUNT) {
+      this.isPaused = true;
+      return;
+    }
+
+    const fileReader = new FileReader();
+    const start = (this.uploadProgress$.value / 100) * this.fileToSend.size;
+    const end = Math.min(start + this.CHUNK_SIZE, this.fileToSend.size);
+    const blob = this.fileToSend.slice(start, end);
+
+    fileReader.onload = (e) => {
+      if (e.target?.result) {
+        const arrayBuffer = e.target.result as ArrayBuffer;
+        this.webrtcService.sendRawData(arrayBuffer, targetUser);
+        const progress = (end / this.fileToSend!.size) * 100;
+
+        if (isFinite(progress)) {
+          this.uploadProgress$.next(parseFloat(progress.toFixed(2)));
+        } else {
+          console.error('Upload progress is non-finite');
+        }
+
+        if (end < this.fileToSend!.size) {
+          this.sendNextChunk(targetUser);
+        } else {
+          this.logger.log('File sent successfully');
+          this.uploadProgress$.next(100);
+          this.resetProgressAfterDelay();
+          this.fileToSend = null;
+        }
+      }
+    };
+
+    fileReader.onerror = (error) => {
+      console.error('Error reading file chunk:', error);
+    };
+
+    fileReader.readAsArrayBuffer(blob);
+  }
+
+  private resetProgressAfterDelay(): void {
+    setTimeout(() => {
+      this.uploadProgress$.next(0);
+      this.downloadProgress$.next(0);
+    }, 2000);
+  }
+}

From e017bf2bc097d715bd16f594f18f73e092acd730 Mon Sep 17 00:00:00 2001
From: Sulaiman AlRomaih <xSloMxSA@gmail.com>
Date: Sun, 20 Oct 2024 15:38:13 +0300
Subject: [PATCH 09/12] Add constant util

---
 client/src/app/core/services/chat.service.ts  |  3 +-
 .../core/services/file-transfer.service.ts    | 20 +++++----
 .../src/app/core/services/webrtc.service.ts   | 41 ++++++++++++-------
 .../src/app/features/chat/chat.component.ts   |  2 +-
 client/src/app/utils/constants.ts             | 39 ++++++++++++++++++
 client/tsconfig.json                          |  1 +
 6 files changed, 81 insertions(+), 25 deletions(-)
 create mode 100644 client/src/app/utils/constants.ts

diff --git a/client/src/app/core/services/chat.service.ts b/client/src/app/core/services/chat.service.ts
index e550dc0..b432453 100644
--- a/client/src/app/core/services/chat.service.ts
+++ b/client/src/app/core/services/chat.service.ts
@@ -4,6 +4,7 @@ import { LoggerService } from './logger.service';
 import { WebSocketConnectionService } from './websocket-connection.service';
 import { WebRTCService } from './webrtc.service';
 import { UserService } from './user.service';
+import {DATA_CHANNEL_MESSAGE_TYPES} from "../../utils/constants";
 
 @Injectable({
   providedIn: 'root',
@@ -38,7 +39,7 @@ export class ChatService {
   public sendMessage(content: string, targetUser: string): void {
     if (content.trim()) {
       const message = {
-        type: 'chat',
+        type: DATA_CHANNEL_MESSAGE_TYPES.CHAT,
         payload: `${this.user}: ${content.trim()}`,
       };
       this.webrtcService.sendData(message, targetUser);
diff --git a/client/src/app/core/services/file-transfer.service.ts b/client/src/app/core/services/file-transfer.service.ts
index 1ff5005..cf19d9d 100644
--- a/client/src/app/core/services/file-transfer.service.ts
+++ b/client/src/app/core/services/file-transfer.service.ts
@@ -2,6 +2,11 @@ import { Injectable } from '@angular/core';
 import { BehaviorSubject } from 'rxjs';
 import { LoggerService } from './logger.service';
 import { WebRTCService } from './webrtc.service';
+import {
+  CHUNK_SIZE,
+  FILE_TRANSFER_MESSAGE_TYPES,
+  MAX_BUFFERED_AMOUNT
+} from '../../utils/constants';
 
 @Injectable({
   providedIn: 'root',
@@ -19,9 +24,6 @@ export class FileTransferService {
   private incomingFileSize = 0;
   private isReceivingFile = false;
 
-  private readonly CHUNK_SIZE = 32 * 1024;
-  private readonly MAX_BUFFERED_AMOUNT = 256 * 1024;
-
   constructor(
     private logger: LoggerService,
     private webrtcService: WebRTCService
@@ -64,20 +66,20 @@ export class FileTransferService {
     this.targetUser = targetUser;
   }
 
-  public sendFileOffer(): void {
+  public sendFileOffer(targetUser: string): void {
     if (!this.fileToSend) {
       console.error('No file to send.');
       return;
     }
-    this.logger.log(`Sending file offer to ${this.targetUser}`);
+    this.logger.log(`Sending file offer to ${targetUser}`);
     const message = {
-      type: 'file-offer',
+      type: FILE_TRANSFER_MESSAGE_TYPES.FILE_OFFER,
       payload: {
         fileName: this.fileToSend.name,
         fileSize: this.fileToSend.size,
       },
     };
-    this.webrtcService.sendData(message, this.targetUser);
+    this.webrtcService.sendData(message, targetUser);
   }
 
   public startSavingFile(): void {
@@ -164,14 +166,14 @@ export class FileTransferService {
       return;
     }
 
-    if (dataChannel.bufferedAmount > this.MAX_BUFFERED_AMOUNT) {
+    if (dataChannel.bufferedAmount > MAX_BUFFERED_AMOUNT) {
       this.isPaused = true;
       return;
     }
 
     const fileReader = new FileReader();
     const start = (this.uploadProgress$.value / 100) * this.fileToSend.size;
-    const end = Math.min(start + this.CHUNK_SIZE, this.fileToSend.size);
+    const end = Math.min(start + CHUNK_SIZE, this.fileToSend.size);
     const blob = this.fileToSend.slice(start, end);
 
     fileReader.onload = (e) => {
diff --git a/client/src/app/core/services/webrtc.service.ts b/client/src/app/core/services/webrtc.service.ts
index 335bf77..e49b899 100644
--- a/client/src/app/core/services/webrtc.service.ts
+++ b/client/src/app/core/services/webrtc.service.ts
@@ -3,14 +3,27 @@ import { BehaviorSubject, Subject } from 'rxjs';
 import { LoggerService } from './logger.service';
 import { WebSocketConnectionService } from './websocket-connection.service';
 import { UserService } from './user.service';
+import {
+  BUFFERED_AMOUNT_LOW_THRESHOLD,
+  OFFER_OPTIONS,
+  DATA_CHANNEL_OPTIONS,
+  SIGNAL_MESSAGE_TYPES,
+  DATA_CHANNEL_MESSAGE_TYPES, FILE_TRANSFER_MESSAGE_TYPES
+} from '../../utils/constants';
 
 interface SignalMessage {
-  type: 'offer' | 'answer' | 'candidate';
+  type: SignalMessageType;
   data: any;
   from: string;
   to: string;
 }
 
+enum SignalMessageType {
+  OFFER = 'offer',
+  ANSWER = 'answer',
+  CANDIDATE = 'candidate',
+}
+
 interface DataChannelMessage {
   type: string;
   payload: any;
@@ -54,16 +67,16 @@ export class WebRTCService {
     this.logger.log(`Initiating connection with ${targetUser}`);
 
     const peerConnection = this.createPeerConnection(targetUser);
-    const dataChannel = peerConnection.createDataChannel('data');
+    const dataChannel = peerConnection.createDataChannel('data', DATA_CHANNEL_OPTIONS);
     this.setupDataChannel(dataChannel, targetUser);
     this.dataChannels.set(targetUser, dataChannel);
 
     peerConnection
-      .createOffer()
+      .createOffer(OFFER_OPTIONS)
       .then((offer) => peerConnection.setLocalDescription(offer))
       .then(() => {
         const message: SignalMessage = {
-          type: 'offer',
+          type: SignalMessageType.OFFER,
           data: peerConnection.localDescription,
           from: this.userService.user,
           to: targetUser,
@@ -85,7 +98,7 @@ export class WebRTCService {
     peerConnection.onicecandidate = (event) => {
       if (event.candidate) {
         const message: SignalMessage = {
-          type: 'candidate',
+          type: SignalMessageType.CANDIDATE,
           data: event.candidate,
           from: this.userService.user,
           to: targetUser,
@@ -150,7 +163,7 @@ export class WebRTCService {
       }
     };
 
-    channel.bufferedAmountLowThreshold = 128 * 1024; // 128 KB
+    channel.bufferedAmountLowThreshold = BUFFERED_AMOUNT_LOW_THRESHOLD;
     channel.onbufferedamountlow = () => {
       this.bufferedAmountLow$.next();
     };
@@ -160,10 +173,10 @@ export class WebRTCService {
     if (typeof data === 'string') {
       const message: DataChannelMessage = JSON.parse(data);
       switch (message.type) {
-        case 'chat':
+        case DATA_CHANNEL_MESSAGE_TYPES.CHAT:
           this.chatMessages$.next(message.payload);
           break;
-        case 'file-offer':
+        case FILE_TRANSFER_MESSAGE_TYPES.FILE_OFFER:
           this.logger.log(`Received file offer from ${targetUser}`);
           this.fileOffers$.next({
             fileName: message.payload.fileName,
@@ -171,11 +184,11 @@ export class WebRTCService {
             fromUser: targetUser,
           });
           break;
-        case 'file-accept':
+        case FILE_TRANSFER_MESSAGE_TYPES.FILE_ACCEPT:
           this.logger.log(`Received file acceptance from ${targetUser}`);
           this.fileResponses$.next({ accepted: true, fromUser: targetUser });
           break;
-        case 'file-decline':
+        case FILE_TRANSFER_MESSAGE_TYPES.FILE_DECLINE:
           this.logger.log(`Received file decline from ${targetUser}`);
           this.fileResponses$.next({ accepted: false, fromUser: targetUser });
           break;
@@ -265,13 +278,13 @@ export class WebRTCService {
     }
 
     switch (message.type) {
-      case 'offer':
+      case SIGNAL_MESSAGE_TYPES.OFFER:
         this.handleOffer(message);
         break;
-      case 'answer':
+      case SIGNAL_MESSAGE_TYPES.ANSWER:
         this.handleAnswer(message);
         break;
-      case 'candidate':
+      case SIGNAL_MESSAGE_TYPES.CANDIDATE:
         this.handleCandidate(message);
         break;
       default:
@@ -293,7 +306,7 @@ export class WebRTCService {
       })
       .then(() => {
         const response: SignalMessage = {
-          type: 'answer',
+          type: SignalMessageType.ANSWER,
           data: peerConnection.localDescription,
           from: this.userService.user,
           to: targetUser,
diff --git a/client/src/app/features/chat/chat.component.ts b/client/src/app/features/chat/chat.component.ts
index 8216718..4b83cae 100644
--- a/client/src/app/features/chat/chat.component.ts
+++ b/client/src/app/features/chat/chat.component.ts
@@ -176,7 +176,7 @@ export class ChatComponent implements OnInit, OnDestroy, AfterViewInit {
           .pipe(take(1))
           .subscribe((isOpen) => {
             if (isOpen) {
-              this.fileTransferService.sendFileOffer();
+              this.fileTransferService.sendFileOffer(member);
             }
           });
       });
diff --git a/client/src/app/utils/constants.ts b/client/src/app/utils/constants.ts
new file mode 100644
index 0000000..64e2a5f
--- /dev/null
+++ b/client/src/app/utils/constants.ts
@@ -0,0 +1,39 @@
+// File transfer constants
+export const CHUNK_SIZE = 32 * 1024; // 32 KB
+export const MAX_BUFFERED_AMOUNT = 256 * 1024; // 256 KB
+export const BUFFERED_AMOUNT_LOW_THRESHOLD = 128 * 1024; // 128 KB
+
+// WebRTC constants
+export const OFFER_OPTIONS = {
+  offerToReceiveAudio: false,
+  offerToReceiveVideo: false,
+};
+
+// WebRTC data channel constants
+export const DATA_CHANNEL_OPTIONS = {
+  ordered: true,
+  maxPacketLifeTime: 3000,
+};
+
+// WebRTC signaling message types
+export const SIGNAL_MESSAGE_TYPES = {
+  OFFER: 'offer',
+  ANSWER: 'answer',
+  CANDIDATE: 'candidate',
+  FILE_OFFER: 'file-offer',
+  FILE_RESPONSE: 'file-response',
+};
+
+// WebRTC file transfer message types
+export const FILE_TRANSFER_MESSAGE_TYPES = {
+  FILE_CHUNK: 'file-chunk',
+  FILE_ACCEPT: 'file-accept',
+  FILE_DECLINE: 'file-decline',
+  FILE_OFFER: 'file-offer',
+};
+
+// WebRTC data channel message types
+export const DATA_CHANNEL_MESSAGE_TYPES = {
+  CHAT: 'chat',
+  FILE: 'file',
+};
diff --git a/client/tsconfig.json b/client/tsconfig.json
index a7dad57..cb2837d 100644
--- a/client/tsconfig.json
+++ b/client/tsconfig.json
@@ -1,6 +1,7 @@
 /* To learn more about Typescript configuration file: https://www.typescriptlang.org/docs/handbook/tsconfig-json.html. */
 /* To learn more about Angular compiler options: https://angular.dev/reference/configs/angular-compiler-options. */
 {
+  "include": ["src/**/*.ts", "src/**/*.html"],
   "compileOnSave": false,
   "compilerOptions": {
     "outDir": "./dist/out-tsc",

From e07bc2c764236b25c429e4db805eeb01067af977 Mon Sep 17 00:00:00 2001
From: Sulaiman AlRomaih <xSloMxSA@gmail.com>
Date: Sun, 20 Oct 2024 15:57:04 +0300
Subject: [PATCH 10/12] Server: Remove unused functionalities.

- Here after we implement the WebRTC we will remove some unwanted functionalities such as sending attachments and messages.
---
 .fleet/settings.json     |   3 +
 server/src/actor.rs      |   4 +-
 server/src/attachment.rs | 265 ---------------------------------------
 server/src/handler.rs    |  51 ++++----
 server/src/lib.rs        |   4 +-
 server/src/message.rs    |  65 ++++------
 server/src/server.rs     |   8 +-
 server/src/session.rs    |  63 +++++-----
 8 files changed, 87 insertions(+), 376 deletions(-)
 create mode 100644 .fleet/settings.json
 delete mode 100644 server/src/attachment.rs

diff --git a/.fleet/settings.json b/.fleet/settings.json
new file mode 100644
index 0000000..1d807ed
--- /dev/null
+++ b/.fleet/settings.json
@@ -0,0 +1,3 @@
+{
+    "plugins": []
+}
\ No newline at end of file
diff --git a/server/src/actor.rs b/server/src/actor.rs
index bed586f..6b6762f 100644
--- a/server/src/actor.rs
+++ b/server/src/actor.rs
@@ -2,15 +2,13 @@ use actix::{prelude::Actor, Context};
 use actix_broker::BrokerSubscribe;
 use actix_web_actors::ws;
 
-use crate::{LeaveRoom, SendFile, SendMessage, WsChatServer, WsChatSession};
+use crate::{LeaveRoom, WsChatServer, WsChatSession};
 
 impl Actor for WsChatServer {
     type Context = Context<Self>;
 
     fn started(&mut self, ctx: &mut Self::Context) {
         self.subscribe_system_async::<LeaveRoom>(ctx);
-        self.subscribe_system_async::<SendMessage>(ctx);
-        self.subscribe_system_async::<SendFile>(ctx);
     }
 }
 
diff --git a/server/src/attachment.rs b/server/src/attachment.rs
deleted file mode 100644
index 76e37da..0000000
--- a/server/src/attachment.rs
+++ /dev/null
@@ -1,265 +0,0 @@
-use actix_web_actors::ws;
-use base64::{engine::general_purpose, Engine as _};
-
-use crate::{
-    message::FileChunkMetadata, ChatMessage, ServerError, WsChatServer, WsChatSession,
-    MAX_FRAME_SIZE,
-};
-
-impl WsChatServer {
-    #[allow(dead_code)]
-    pub fn send_chat_attachment(
-        &mut self,
-        session_id: &str,
-        room_name: &str,
-        file_name: &str,
-        mime_type: &str,
-        file_data: Vec<u8>,
-        src: usize,
-    ) -> Option<()> {
-        let rooms = self.rooms.get_mut(session_id)?;
-        let room = rooms.get_mut(room_name)?;
-
-        let client_ids: Vec<usize> = room.keys().cloned().collect();
-
-        for id in client_ids {
-            if let Some(client) = room.get(&id) {
-                if id == src {
-                    log::debug!(
-                        "Sending confirmation to sender {} in room {}",
-                        id,
-                        room_name
-                    );
-                    client
-                        .recipient
-                        .try_send(ChatMessage(format!(
-                            "[SystemAck]: File '{}' sent successfully.",
-                            file_name
-                        )))
-                        .ok();
-                    continue;
-                }
-
-                if id == src {
-                    client
-                        .recipient
-                        .try_send(ChatMessage(format!(
-                            "[SystemAck]: File '{}' sent successfully.",
-                            file_name
-                        )))
-                        .ok();
-                } else {
-                    log::debug!(
-                        "Sending file {} to client {} in room {}",
-                        file_name,
-                        id,
-                        room_name
-                    );
-
-                    if client
-                        .recipient
-                        .try_send(ChatMessage(format!(
-                            "[SystemFile]:{}:{}:{}",
-                            file_name,
-                            mime_type,
-                            general_purpose::STANDARD.encode(&file_data)
-                        )))
-                        .is_ok()
-                    {
-                        continue;
-                    } else {
-                        log::warn!(
-                            "Failed to send file {} to client {}, removing from room: {}",
-                            file_name,
-                            id,
-                            room_name
-                        );
-                        room.remove(&id);
-                    }
-                }
-            }
-        }
-
-        Some(())
-    }
-
-    pub fn send_chat_attachment_in_chunks(
-        &mut self,
-        session_id: &str,
-        room_name: &str,
-        file_name: &str,
-        mime_type: &str,
-        file_data: Vec<u8>,
-        src: usize,
-    ) -> Option<()> {
-        let total_chunks = (file_data.len() as f64 / MAX_FRAME_SIZE as f64).ceil() as usize;
-        let max_retries = 3;
-        let delay_between_chunks = std::time::Duration::from_millis(10);
-
-        let rooms = self.rooms.get_mut(session_id)?;
-        let room = rooms.get_mut(room_name)?;
-
-        let client_ids: Vec<usize> = room.keys().cloned().collect();
-
-        for id in client_ids {
-            if let Some(client) = room.get(&id) {
-                if id == src {
-                    log::debug!(
-                        "Sending confirmation to sender {} in room {}",
-                        id,
-                        room_name
-                    );
-                    client
-                        .recipient
-                        .try_send(ChatMessage(format!(
-                            "[SystemAck]: File '{}' sent successfully.",
-                            file_name
-                        )))
-                        .ok();
-                    continue;
-                }
-
-                let mut success = true;
-
-                for (i, chunk) in file_data.chunks(MAX_FRAME_SIZE).enumerate() {
-                    let encoded_chunk = general_purpose::STANDARD.encode(chunk);
-
-                    log::debug!(
-                        "Sending chunk {} of {} for file {} to client {} in room {}",
-                        i + 1,
-                        total_chunks,
-                        file_name,
-                        id,
-                        room_name
-                    );
-
-                    let chat_message = format!(
-                        "[SystemFileChunk]:{}:{}:{}:{}:{}",
-                        file_name,
-                        mime_type,
-                        i + 1,
-                        total_chunks,
-                        encoded_chunk
-                    );
-
-                    let mut retries = 0;
-                    while retries < max_retries {
-                        if client
-                            .recipient
-                            .try_send(ChatMessage(chat_message.clone()))
-                            .is_ok()
-                        {
-                            break;
-                        } else {
-                            retries += 1;
-                            log::warn!(
-                                "Failed to send chunk {} of file {} to client {}, retrying ({}/{})",
-                                i + 1,
-                                file_name,
-                                id,
-                                retries,
-                                max_retries
-                            );
-                            std::thread::sleep(delay_between_chunks);
-                        }
-                    }
-
-                    if retries == max_retries {
-                        log::warn!(
-                            "Failed to send chunk {} of file {} to client {} after {} retries, removing from room: {}",
-                            i + 1,
-                            file_name,
-                            id,
-                            max_retries,
-                            room_name
-                        );
-                        success = false;
-                        break;
-                    }
-
-                    std::thread::sleep(delay_between_chunks);
-                }
-
-                if !success {
-                    room.remove(&id);
-                }
-            }
-        }
-
-        Some(())
-    }
-}
-
-impl WsChatSession {
-    pub fn handle_binary_message(&mut self, bin: &[u8], ctx: &mut ws::WebsocketContext<Self>) {
-        match self.split_metadata_and_data(bin) {
-            Ok((metadata, chunk_data)) => {
-                log::debug!("Received file chunk");
-                match serde_json::from_slice::<FileChunkMetadata>(&metadata) {
-                    Ok(chunk_metadata) => {
-                        log::debug!(
-                            "Received chunk {} of file {} (total chunks: {})",
-                            chunk_metadata.current_chunk,
-                            chunk_metadata.file_name,
-                            chunk_metadata.total_chunks
-                        );
-
-                        if let Err(e) = self.handle_file_chunk(chunk_metadata, chunk_data) {
-                            log::error!("Failed to process file chunk: {:?}", e);
-                            ctx.text(format!("[SystemError] Error processing file chunk: {}", e));
-                        }
-                    }
-                    Err(e) => {
-                        log::error!("Failed to parse file chunk metadata: {:?}", e);
-                        ctx.text(format!(
-                            "[SystemError] Error: {:?}",
-                            ServerError::MetadataParsingError
-                        ));
-                    }
-                }
-            }
-            Err(e) => {
-                log::error!("Invalid file message format: {:?}", e);
-                ctx.text(format!(
-                    "[SystemError] Error: {:?}",
-                    ServerError::InvalidFile
-                ));
-            }
-        }
-    }
-
-    fn handle_file_chunk(
-        &mut self,
-        chunk_metadata: FileChunkMetadata,
-        chunk_data: Vec<u8>,
-    ) -> Result<(), ServerError> {
-        let reassembler = self
-            .file_reassemblers
-            .entry(chunk_metadata.file_name.clone())
-            .or_insert_with(|| FileReassembler::new(chunk_metadata.total_chunks));
-
-        reassembler.add_chunk(chunk_metadata.current_chunk, chunk_data)?;
-
-        if reassembler.is_complete() {
-            let file_data = reassembler.reassemble()?;
-            self.send_file(
-                &chunk_metadata.file_name,
-                &chunk_metadata.mime_type,
-                &file_data,
-            );
-            self.file_reassemblers.remove(&chunk_metadata.file_name);
-        }
-
-        Ok(())
-    }
-
-    fn split_metadata_and_data(&self, bin: &[u8]) -> Result<(Vec<u8>, Vec<u8>), ServerError> {
-        if let Some(pos) = bin.iter().position(|&byte| byte == 0) {
-            let metadata = bin[..pos].to_vec();
-            let data = bin[pos + 1..].to_vec();
-            Ok((metadata, data))
-        } else {
-            Err(ServerError::MetadataParsingError)
-        }
-    }
-}
diff --git a/server/src/handler.rs b/server/src/handler.rs
index 5b4a98d..bbceaaf 100644
--- a/server/src/handler.rs
+++ b/server/src/handler.rs
@@ -1,34 +1,10 @@
 use actix::{Handler, MessageResult};
 
 use crate::{
-    ChatMessage, JoinRoom, LeaveRoom, ListRooms, SendFile, SendMessage, WsChatServer, WsChatSession,
+    message::RelaySignalMessage, ChatMessage, JoinRoom, LeaveRoom, ListRooms, WsChatServer,
+    WsChatSession,
 };
 
-impl Handler<SendMessage> for WsChatServer {
-    type Result = ();
-
-    fn handle(&mut self, msg: SendMessage, _ctx: &mut Self::Context) {
-        let SendMessage(session_id, room_name, id, msg) = msg;
-        self.send_chat_message(&session_id, &room_name, &msg, id);
-    }
-}
-
-impl Handler<SendFile> for WsChatServer {
-    type Result = ();
-
-    fn handle(&mut self, msg: SendFile, _ctx: &mut Self::Context) {
-        let SendFile(session_id, room_name, id, file_name, mime_type, file_data) = msg;
-        self.send_chat_attachment_in_chunks(
-            &session_id,
-            &room_name,
-            &file_name,
-            &mime_type,
-            file_data,
-            id,
-        );
-    }
-}
-
 impl Handler<JoinRoom> for WsChatServer {
     type Result = MessageResult<JoinRoom>;
 
@@ -39,7 +15,7 @@ impl Handler<JoinRoom> for WsChatServer {
             self.add_client_to_room(&session_id, &room_name, None, client, client_name.clone());
         let join_msg = format!("{} [SystemJoin] {}", client_name, room_name);
 
-        self.send_chat_message(&session_id, &room_name, &join_msg, id);
+        self.send_join_message(&session_id, &room_name, &join_msg, id);
         self.broadcast_room_members(&session_id, &room_name);
         MessageResult(id)
     }
@@ -96,3 +72,24 @@ impl Handler<ChatMessage> for WsChatSession {
         ctx.text(msg.0);
     }
 }
+
+impl Handler<RelaySignalMessage> for WsChatServer {
+    type Result = ();
+
+    fn handle(&mut self, msg: RelaySignalMessage, _ctx: &mut Self::Context) {
+        #[allow(unused_variables)]
+        let RelaySignalMessage { from, to, message } = msg;
+
+        // Find the recipient's session and send the message
+        for rooms in self.rooms.values() {
+            for room in rooms.values() {
+                for client in room.values() {
+                    if client.name == to {
+                        let _ = client.recipient.do_send(message.clone());
+                        return;
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/server/src/lib.rs b/server/src/lib.rs
index ff45b74..9ec1e22 100644
--- a/server/src/lib.rs
+++ b/server/src/lib.rs
@@ -1,5 +1,4 @@
 mod actor;
-mod attachment;
 mod consts;
 mod error;
 mod handler;
@@ -10,8 +9,7 @@ mod session_manager;
 
 pub use error::ServerError;
 pub use message::{
-    ChatMessage, ClientMetadata, JoinRoom, LeaveRoom, ListRooms, SendFile, SendMessage,
-    WsChatServer, WsChatSession,
+    ChatMessage, ClientMetadata, JoinRoom, LeaveRoom, ListRooms, WsChatServer, WsChatSession,
 };
 pub use session_manager::SessionManager;
 
diff --git a/server/src/message.rs b/server/src/message.rs
index 75b2da7..806e68c 100644
--- a/server/src/message.rs
+++ b/server/src/message.rs
@@ -7,68 +7,51 @@ pub type Room = HashMap<usize, ClientMetadata>;
 
 #[derive(Default)]
 pub struct WsChatServer {
-    pub rooms: HashMap<String, HashMap<String, Room>>,
+    pub rooms: HashMap<String, HashMap<String, Room>>, // session_id -> room_name -> clients
 }
 
-#[derive(Default)]
+#[derive(Default, Clone)]
 pub struct WsChatSession {
-    pub session_id: String,
-    pub id: usize,
-    pub room: String,
-    pub name: String,
-    pub file_reassemblers: HashMap<String, FileReassembler>,
+    pub session_id: String, // session id
+    pub id: usize,          // client id
+    pub room: String,       // room name
+    pub name: String,       // client name
 }
 
 pub struct ClientMetadata {
-    pub recipient: Client,
-    pub name: String,
+    pub recipient: Client, // client
+    pub name: String,      // client name
 }
 
 #[derive(Clone, Message)]
 #[rtype(result = "()")]
-pub struct ChatMessage(pub String);
+pub struct ChatMessage(pub String /* message */);
 
 #[derive(Clone, Message)]
 #[rtype(result = "usize")]
 pub struct JoinRoom(
-    pub String,
-    pub String,
-    pub String,
-    pub Recipient<ChatMessage>,
+    pub String,                 // session_id
+    pub String,                 // room_name
+    pub String,                 // client_name
+    pub Recipient<ChatMessage>, // client
 );
 
 #[derive(Clone, Message)]
 #[rtype(result = "()")]
-pub struct LeaveRoom(pub String, pub String, pub usize);
+pub struct LeaveRoom(
+    pub String, // session_id
+    pub String, // room_name
+    pub usize,  // id
+);
 
 #[derive(Clone, Message)]
 #[rtype(result = "Vec<String>")]
-pub struct ListRooms(pub String);
-
-#[derive(Clone, Message)]
-#[rtype(result = "()")]
-pub struct SendMessage(pub String, pub String, pub usize, pub String);
+pub struct ListRooms(pub String /* session_id */);
 
-#[derive(Clone, Message)]
+#[derive(Message)]
 #[rtype(result = "()")]
-pub struct SendFile(
-    pub String,
-    pub String,
-    pub usize,
-    pub String,
-    pub String,
-    pub Vec<u8>,
-);
-
-#[derive(serde::Deserialize)]
-pub struct FileChunkMetadata {
-    pub file_name: String,
-    pub mime_type: String,
-    pub total_chunks: usize,
-    pub current_chunk: usize,
-}
-
-pub struct FileReassembler {
-    pub chunks: HashMap<usize, Vec<u8>>,
-    pub total_chunks: usize,
+pub(crate) struct RelaySignalMessage {
+    pub(crate) from: String,
+    pub(crate) to: String,
+    pub(crate) message: ChatMessage,
 }
diff --git a/server/src/server.rs b/server/src/server.rs
index 637fb8f..b9de93a 100644
--- a/server/src/server.rs
+++ b/server/src/server.rs
@@ -60,14 +60,14 @@ impl WsChatServer {
         id
     }
 
-    pub fn send_chat_message(
+    pub fn send_join_message(
         &mut self,
         session_id: &str,
         room_name: &str,
         msg: &str,
         _src: usize,
     ) -> Option<()> {
-        log::debug!("Sending message to room {}: {}", room_name, msg);
+        log::debug!("Sending join message to room {}: {}", room_name, msg);
 
         if let Some(room) = self.rooms.get_mut(session_id)?.get_mut(room_name) {
             let client_ids: Vec<usize> = room.keys().cloned().collect();
@@ -80,13 +80,13 @@ impl WsChatServer {
                         .is_ok()
                     {
                         log::debug!(
-                            "Message sent to client {}, staying in room: {}",
+                            "Join Message sent to client {}, staying in room: {}",
                             id,
                             room_name
                         );
                     } else {
                         log::warn!(
-                            "Failed to send message to client {}, removing from room: {}",
+                            "Failed to send join message to client {}, removing from room: {}",
                             id,
                             room_name
                         );
diff --git a/server/src/session.rs b/server/src/session.rs
index 1e829b5..8c23d96 100644
--- a/server/src/session.rs
+++ b/server/src/session.rs
@@ -1,12 +1,12 @@
+use crate::{
+    error::ServerError,
+    message::{ChatMessage, JoinRoom, LeaveRoom, ListRooms, WsChatServer, WsChatSession},
+};
 use actix::prelude::*;
 use actix_broker::BrokerIssue;
 use actix_web_actors::ws;
 use names::Generator;
-
-use crate::{
-    error::ServerError,
-    message::{JoinRoom, LeaveRoom, ListRooms, SendFile, SendMessage, WsChatServer, WsChatSession},
-};
+use serde_json::Value;
 
 impl WsChatSession {
     pub fn new(session_id: &str) -> Self {
@@ -67,27 +67,6 @@ impl WsChatSession {
             .wait(ctx);
     }
 
-    pub fn send_msg(&self, msg: &str) {
-        let msg = msg.replace("[UserMessage]", "");
-        let content = format!("{}: {msg}", self.name.clone(),);
-        let msg = SendMessage(self.session_id.clone(), self.room.clone(), self.id, content);
-
-        self.issue_system_async(msg);
-    }
-
-    pub fn send_file(&self, file_name: &str, mime_type: &str, file_data: &[u8]) {
-        let msg = SendFile(
-            self.session_id.clone(),
-            self.room.clone(),
-            self.id,
-            file_name.to_string(),
-            mime_type.to_string(),
-            file_data.to_vec(),
-        );
-
-        self.issue_system_async(msg);
-    }
-
     fn user_command(
         &mut self,
         mut command: std::str::SplitN<'_, char>,
@@ -127,6 +106,28 @@ impl WsChatSession {
         }
     }
 
+    fn handle_signal_message(&self, msg: &str, ctx: &mut ws::WebsocketContext<Self>) {
+        let payload = msg.trim_start_matches("[SignalMessage]").trim();
+
+        // Parse the payload to get 'to' field
+        if let Ok(value) = serde_json::from_str::<Value>(payload) {
+            if let Some(to_user) = value.get("to").and_then(|v| v.as_str()) {
+                // Relay the message to the intended recipient
+                let relay_msg = ChatMessage(format!("[SignalMessage] {}", payload));
+
+                WsChatServer::from_registry().do_send(crate::message::RelaySignalMessage {
+                    from: self.name.clone(),
+                    to: to_user.to_string(),
+                    message: relay_msg,
+                });
+            } else {
+                ctx.text("[SystemError] Invalid signaling message format");
+            }
+        } else {
+            ctx.text("[SystemError] Failed to parse signaling message");
+        }
+    }
+
     fn handle_user_disconnect(&self) {
         let leave_msg = LeaveRoom(self.session_id.clone(), self.room.clone(), self.id);
         self.issue_system_async(leave_msg);
@@ -154,14 +155,14 @@ impl StreamHandler<Result<ws::Message, ws::ProtocolError>> for WsChatSession {
 
                 let msg = text.trim();
 
-                if msg.contains("[UserCommand]") {
+                if msg.starts_with("[SignalMessage]") {
+                    self.handle_signal_message(msg, ctx);
+                } else if msg.contains("[UserCommand]") {
                     let msg = msg.replace("[UserCommand]", "").trim().to_string();
                     if msg.starts_with("/") {
                         let command = msg.splitn(2, ' ');
                         self.user_command(command, &msg, ctx);
                     }
-                } else if msg.contains("[UserMessage]") {
-                    self.send_msg(msg);
                 } else if msg.contains("[UserDisconnected]") {
                     log::debug!("Received disconnect command");
                     self.handle_user_disconnect();
@@ -173,10 +174,6 @@ impl StreamHandler<Result<ws::Message, ws::ProtocolError>> for WsChatSession {
                     ));
                 }
             }
-            ws::Message::Binary(bin) => {
-                log::debug!("Received binary message");
-                self.handle_binary_message(&bin, ctx);
-            }
             ws::Message::Close(reason) => {
                 log::debug!("Closing connection: {:?}", reason);
                 self.handle_user_disconnect();

From 07c8d164a6eacaed65a5eee8ddf1bb5549f6ec9d Mon Sep 17 00:00:00 2001
From: Sulaiman AlRomaih <xSloMxSA@gmail.com>
Date: Sun, 20 Oct 2024 16:30:15 +0300
Subject: [PATCH 11/12] client: Improve the attachments

---
 .../core/services/file-transfer.service.ts    | 68 +++++++++++++------
 .../src/app/core/services/webrtc.service.ts   | 19 ++++--
 client/src/app/utils/constants.ts             |  6 ++
 3 files changed, 70 insertions(+), 23 deletions(-)

diff --git a/client/src/app/core/services/file-transfer.service.ts b/client/src/app/core/services/file-transfer.service.ts
index cf19d9d..67efc71 100644
--- a/client/src/app/core/services/file-transfer.service.ts
+++ b/client/src/app/core/services/file-transfer.service.ts
@@ -5,7 +5,7 @@ import { WebRTCService } from './webrtc.service';
 import {
   CHUNK_SIZE,
   FILE_TRANSFER_MESSAGE_TYPES,
-  MAX_BUFFERED_AMOUNT
+  MAX_BUFFERED_AMOUNT,
 } from '../../utils/constants';
 
 @Injectable({
@@ -14,15 +14,20 @@ import {
 export class FileTransferService {
   public uploadProgress$ = new BehaviorSubject<number>(0);
   public downloadProgress$ = new BehaviorSubject<number>(0);
-  public incomingFile$ = new BehaviorSubject<{ fileName: string; fileSize: number; fromUser: string } | null>(null);
+  public incomingFile$ = new BehaviorSubject<{
+    fileName: string;
+    fileSize: number;
+    fromUser: string;
+  } | null>(null);
 
   private fileToSend: File | null = null;
   private targetUser = '';
   private receivedSize = 0;
-  private dataQueue: ArrayBuffer[] = [];
+  private receivedDataBuffer: Uint8Array[] = [];
   private isPaused = false;
   private incomingFileSize = 0;
   private isReceivingFile = false;
+  private currentOffset = 0;
 
   constructor(
     private logger: LoggerService,
@@ -93,7 +98,7 @@ export class FileTransferService {
     this.isReceivingFile = true;
 
     const message = {
-      type: 'file-accept',
+      type: FILE_TRANSFER_MESSAGE_TYPES.FILE_ACCEPT,
       payload: {},
     };
 
@@ -101,16 +106,18 @@ export class FileTransferService {
 
     this.webrtcService.sendData(message, fromUser);
     this.receivedSize = 0;
-    this.dataQueue = [];
+    this.receivedDataBuffer = [];
   }
 
   private async handleDataChunk(data: ArrayBuffer): Promise<void> {
     if (!this.isReceivingFile) {
-      this.logger.log('Received data chunk when not expecting a file transfer. Ignoring.');
+      this.logger.log(
+        'Received data chunk when not expecting a file transfer. Ignoring.'
+      );
       return;
     }
 
-    this.dataQueue.push(data);
+    this.receivedDataBuffer.push(new Uint8Array(data));
     this.receivedSize += data.byteLength;
     const fileSize = this.incomingFileSize;
 
@@ -129,19 +136,34 @@ export class FileTransferService {
 
     if (this.receivedSize >= fileSize) {
       this.logger.log('File received successfully');
-      const receivedBlob = new Blob(this.dataQueue);
+
+      const totalLength = this.receivedDataBuffer.reduce(
+        (acc, curr) => acc + curr.length,
+        0
+      );
+      const combinedArray = new Uint8Array(totalLength);
+      let offset = 0;
+      for (const chunk of this.receivedDataBuffer) {
+        combinedArray.set(chunk, offset);
+        offset += chunk.length;
+      }
+
+      const receivedBlob = new Blob([combinedArray]);
       const downloadUrl = URL.createObjectURL(receivedBlob);
-      const fileName = this.incomingFile$.value?.fileName || 'downloaded_file';
+      const fileName =
+        this.incomingFile$.value?.fileName || 'downloaded_file';
 
       const anchor = document.createElement('a');
       anchor.href = downloadUrl;
       anchor.download = fileName;
+      document.body.appendChild(anchor);
       anchor.click();
+      document.body.removeChild(anchor);
 
       this.downloadProgress$.next(100);
       this.resetProgressAfterDelay();
       this.incomingFile$.next(null);
-      this.dataQueue = [];
+      this.receivedDataBuffer = [];
       this.receivedSize = 0;
       this.incomingFileSize = 0;
       this.isReceivingFile = false;
@@ -154,12 +176,13 @@ export class FileTransferService {
       return;
     }
     this.logger.log(`Starting to send file to ${targetUser}`);
+    this.currentOffset = 0;
     this.sendNextChunk(targetUser);
   }
 
-  private sendNextChunk(targetUser: string): void {
+  private async sendNextChunk(targetUser: string): Promise<void> {
     if (this.isPaused || !this.fileToSend) return;
-
+    const { fileToSend } = this;
     const dataChannel = this.webrtcService.getDataChannel(targetUser);
     if (!dataChannel) {
       console.error(`Data channel is not available for ${targetUser}`);
@@ -171,16 +194,22 @@ export class FileTransferService {
       return;
     }
 
-    const fileReader = new FileReader();
-    const start = (this.uploadProgress$.value / 100) * this.fileToSend.size;
-    const end = Math.min(start + CHUNK_SIZE, this.fileToSend.size);
-    const blob = this.fileToSend.slice(start, end);
+    const start = this.currentOffset;
+    const end = Math.min(start + CHUNK_SIZE, fileToSend.size);
+    const blob = fileToSend.slice(start, end);
 
-    fileReader.onload = (e) => {
+    const fileReader = new FileReader();
+    fileReader.onload = async (e) => {
       if (e.target?.result) {
         const arrayBuffer = e.target.result as ArrayBuffer;
+        while (dataChannel.bufferedAmount > MAX_BUFFERED_AMOUNT) {
+          await new Promise((resolve) => setTimeout(resolve, 100));
+        }
+
         this.webrtcService.sendRawData(arrayBuffer, targetUser);
-        const progress = (end / this.fileToSend!.size) * 100;
+        this.currentOffset = end;
+
+        const progress = (this.currentOffset / fileToSend.size) * 100;
 
         if (isFinite(progress)) {
           this.uploadProgress$.next(parseFloat(progress.toFixed(2)));
@@ -188,13 +217,14 @@ export class FileTransferService {
           console.error('Upload progress is non-finite');
         }
 
-        if (end < this.fileToSend!.size) {
+        if (this.currentOffset < fileToSend.size) {
           this.sendNextChunk(targetUser);
         } else {
           this.logger.log('File sent successfully');
           this.uploadProgress$.next(100);
           this.resetProgressAfterDelay();
           this.fileToSend = null;
+          this.currentOffset = 0;
         }
       }
     };
diff --git a/client/src/app/core/services/webrtc.service.ts b/client/src/app/core/services/webrtc.service.ts
index e49b899..de66acb 100644
--- a/client/src/app/core/services/webrtc.service.ts
+++ b/client/src/app/core/services/webrtc.service.ts
@@ -8,7 +8,9 @@ import {
   OFFER_OPTIONS,
   DATA_CHANNEL_OPTIONS,
   SIGNAL_MESSAGE_TYPES,
-  DATA_CHANNEL_MESSAGE_TYPES, FILE_TRANSFER_MESSAGE_TYPES
+  DATA_CHANNEL_MESSAGE_TYPES,
+  FILE_TRANSFER_MESSAGE_TYPES,
+  ICE_SERVERS,
 } from '../../utils/constants';
 
 interface SignalMessage {
@@ -36,7 +38,11 @@ export class WebRTCService {
   public dataChannelOpen$ = new BehaviorSubject<boolean>(false);
 
   public chatMessages$ = new Subject<string>();
-  public fileOffers$ = new Subject<{ fileName: string; fileSize: number; fromUser: string }>();
+  public fileOffers$ = new Subject<{
+    fileName: string;
+    fileSize: number;
+    fromUser: string;
+  }>();
   public fileResponses$ = new Subject<{ accepted: boolean; fromUser: string }>();
   public incomingData$ = new Subject<ArrayBuffer>();
   public bufferedAmountLow$ = new Subject<void>();
@@ -90,7 +96,7 @@ export class WebRTCService {
 
   private createPeerConnection(targetUser: string): RTCPeerConnection {
     const configuration = {
-      iceServers: [{ urls: 'stun:stun.l.google.com:19302' }],
+      iceServers: ICE_SERVERS,
     };
 
     const peerConnection = new RTCPeerConnection(configuration);
@@ -126,6 +132,7 @@ export class WebRTCService {
   }
 
   private setupDataChannel(channel: RTCDataChannel, targetUser: string): void {
+    channel.binaryType = 'arraybuffer';
     channel.onopen = () => {
       this.logger.log(`Data channel with ${targetUser} is open`);
       this.dataChannelOpen$.next(true);
@@ -197,6 +204,8 @@ export class WebRTCService {
       }
     } else if (data instanceof ArrayBuffer) {
       this.incomingData$.next(data);
+    } else {
+      console.warn('Unknown data type received:', data);
     }
   }
 
@@ -206,7 +215,9 @@ export class WebRTCService {
     if (channel && channel.readyState === 'open') {
       channel.send(JSON.stringify(message));
     } else if (channel && channel.readyState === 'connecting') {
-      console.warn(`Data channel with ${targetUser} is connecting. Message will be queued.`);
+      console.warn(
+        `Data channel with ${targetUser} is connecting. Message will be queued.`
+      );
 
       if (!this.messageQueues.has(targetUser)) {
         this.messageQueues.set(targetUser, []);
diff --git a/client/src/app/utils/constants.ts b/client/src/app/utils/constants.ts
index 64e2a5f..de7b1f6 100644
--- a/client/src/app/utils/constants.ts
+++ b/client/src/app/utils/constants.ts
@@ -9,6 +9,12 @@ export const OFFER_OPTIONS = {
   offerToReceiveVideo: false,
 };
 
+export const ICE_SERVERS = [
+  {
+    urls: 'stun:stun.l.google.com:19302',
+  },
+];
+
 // WebRTC data channel constants
 export const DATA_CHANNEL_OPTIONS = {
   ordered: true,

From 62720c7bc861e96b4b12dbb952c038693cbb3e07 Mon Sep 17 00:00:00 2001
From: Sulaiman AlRomaih <xSloMxSA@gmail.com>
Date: Sun, 20 Oct 2024 18:13:44 +0300
Subject: [PATCH 12/12] Bump build.

Client: 0.3.0
Server: 0.3.0
---
 Cargo.lock               |    2 +-
 client/package-lock.json | 2146 ++++++++++++++++++++++++++++++++------
 client/package.json      |   22 +-
 server/Cargo.toml        |    4 +-
 4 files changed, 1844 insertions(+), 330 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 2c72ba0..01b72cf 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1337,7 +1337,7 @@ dependencies = [
 
 [[package]]
 name = "server"
-version = "0.2.0"
+version = "0.3.0"
 dependencies = [
  "actix",
  "actix-broker",
diff --git a/client/package-lock.json b/client/package-lock.json
index 3aa2585..99d04d8 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "client",
-  "version": "0.0.2",
+  "version": "0.2.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "client",
-      "version": "0.0.2",
+      "version": "0.2.1",
       "dependencies": {
         "@angular/animations": "^18.1.0",
         "@angular/cdk": "^18.1.3",
@@ -20,9 +20,11 @@
         "@angular/platform-server": "^18.1.0",
         "@angular/router": "^18.1.0",
         "@angular/ssr": "^18.1.2",
+        "@eslint/js": "^9.13.0",
         "@fortawesome/angular-fontawesome": "^0.15.0",
         "@fortawesome/fontawesome-svg-core": "^6.6.0",
         "@fortawesome/free-solid-svg-icons": "^6.6.0",
+        "eslint": "^9.13.0",
         "express": "^4.18.2",
         "ngx-file-drop": "^16.0.0",
         "rxjs": "~7.8.0",
@@ -32,13 +34,24 @@
       },
       "devDependencies": {
         "@angular-devkit/build-angular": "^18.1.2",
+        "@angular-eslint/builder": "18.3.0",
+        "@angular-eslint/eslint-plugin": "18.3.0",
+        "@angular-eslint/eslint-plugin-template": "18.3.0",
+        "@angular-eslint/schematics": "18.3.0",
+        "@angular-eslint/template-parser": "18.3.0",
         "@angular/cli": "^18.1.2",
         "@angular/compiler-cli": "^18.1.0",
         "@types/express": "^4.17.17",
         "@types/jasmine": "~5.1.0",
         "@types/node": "^22.1.0",
+        "@typescript-eslint/eslint-plugin": "7.11.0",
+        "@typescript-eslint/parser": "7.11.0",
         "angular-eslint": "18.3.0",
-        "eslint": "^9.9.0",
+        "eslint": "8.57.0",
+        "eslint-config-airbnb-base": "^15.0.0",
+        "eslint-config-airbnb-typescript": "^18.0.0",
+        "eslint-plugin-simple-import-sort": "^12.1.1",
+        "eslint-plugin-unused-imports": "^4.1.4",
         "jasmine-core": "~5.2.0",
         "karma": "~6.4.0",
         "karma-chrome-launcher": "~3.2.0",
@@ -375,9 +388,9 @@
       }
     },
     "node_modules/@angular-eslint/template-parser/node_modules/eslint-scope": {
-      "version": "8.0.2",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.0.2.tgz",
-      "integrity": "sha512-6E4xmrTw5wtxnLA5wYL3WDfhZ/1bUBGOXV0zQvVRDOtrR8D0p6W7fs3JweNYhwRYeGvd/1CKX2se0/2s7Q/nJA==",
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.1.0.tgz",
+      "integrity": "sha512-14dSvlhaVhKKsa9Fx1l8A17s7ah7Ef7wCakJ10LYk6+GYmP9yDti2oq2SEwcyndt6knfcZyhyxwY3i9yL78EQw==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
@@ -3121,32 +3134,17 @@
         "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
       }
     },
-    "node_modules/@eslint/config-array": {
-      "version": "0.18.0",
-      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.18.0.tgz",
-      "integrity": "sha512-fTxvnS1sRMu3+JjXwJG0j/i4RT9u4qJ+lqS/yCGap4lH4zZGzQ7tu+xZqQmcMZq5OBZDL4QRxQzRjkWcGt8IVw==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@eslint/object-schema": "^2.1.4",
-        "debug": "^4.3.1",
-        "minimatch": "^3.1.2"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      }
-    },
     "node_modules/@eslint/eslintrc": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.1.0.tgz",
-      "integrity": "sha512-4Bfj15dVJdoy3RfZmmo86RK1Fwzn6SstsvK9JS+BaVKqC6QQQQyXekNaC+g+LKNgkQ+2VhGAzm6hO40AhMR3zQ==",
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz",
+      "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "ajv": "^6.12.4",
         "debug": "^4.3.2",
-        "espree": "^10.0.1",
-        "globals": "^14.0.0",
+        "espree": "^9.6.0",
+        "globals": "^13.19.0",
         "ignore": "^5.2.0",
         "import-fresh": "^3.2.1",
         "js-yaml": "^4.1.0",
@@ -3154,7 +3152,7 @@
         "strip-json-comments": "^3.1.1"
       },
       "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
       "funding": {
         "url": "https://opencollective.com/eslint"
@@ -3178,13 +3176,16 @@
       }
     },
     "node_modules/@eslint/eslintrc/node_modules/globals": {
-      "version": "14.0.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz",
-      "integrity": "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==",
+      "version": "13.24.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
+      "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
       "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "type-fest": "^0.20.2"
+      },
       "engines": {
-        "node": ">=18"
+        "node": ">=8"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
@@ -3197,22 +3198,24 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/@eslint/js": {
-      "version": "9.9.1",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.9.1.tgz",
-      "integrity": "sha512-xIDQRsfg5hNBqHz04H1R3scSVwmI+KUbqjsQKHKQ1DAUSaUjYPReZZmS/5PNiKu1fUvzDd6H7DEDKACSEhu+TQ==",
+    "node_modules/@eslint/eslintrc/node_modules/type-fest": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
       "dev": true,
-      "license": "MIT",
+      "license": "(MIT OR CC0-1.0)",
       "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@eslint/object-schema": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.4.tgz",
-      "integrity": "sha512-BsWiH1yFGjXXS2yvrf5LyuoSIIbPrGUWob917o+BTKuZ7qJdxX8aJLRxs1fS9n6r7vESrq1OUqb68dANcFXuQQ==",
-      "dev": true,
-      "license": "Apache-2.0",
+    "node_modules/@eslint/js": {
+      "version": "9.13.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.13.0.tgz",
+      "integrity": "sha512-IFLyoY4d72Z5y/6o/BazFBezupzI/taV8sGumxTAVw3lXG9A6md1Dc34T9s1FoD/an9pJH8RHbAxsaEbBed9lA==",
+      "license": "MIT",
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       }
@@ -3263,6 +3266,22 @@
         "node": ">=6"
       }
     },
+    "node_modules/@humanwhocodes/config-array": {
+      "version": "0.11.14",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz",
+      "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==",
+      "deprecated": "Use @eslint/config-array instead",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@humanwhocodes/object-schema": "^2.0.2",
+        "debug": "^4.3.1",
+        "minimatch": "^3.0.5"
+      },
+      "engines": {
+        "node": ">=10.10.0"
+      }
+    },
     "node_modules/@humanwhocodes/module-importer": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
@@ -3277,19 +3296,13 @@
         "url": "https://github.com/sponsors/nzakas"
       }
     },
-    "node_modules/@humanwhocodes/retry": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.0.tgz",
-      "integrity": "sha512-d2CGZR2o7fS6sWB7DG/3a95bGKQyHMACZ5aW8qGkkqQpUoZV6C0X7Pc7l4ZNMZkfNBf4VWNe9E1jRsf0G146Ew==",
+    "node_modules/@humanwhocodes/object-schema": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz",
+      "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==",
+      "deprecated": "Use @eslint/object-schema instead",
       "dev": true,
-      "license": "Apache-2.0",
-      "engines": {
-        "node": ">=18.18"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/nzakas"
-      }
+      "license": "BSD-3-Clause"
     },
     "node_modules/@inquirer/checkbox": {
       "version": "2.4.7",
@@ -4665,6 +4678,14 @@
         "win32"
       ]
     },
+    "node_modules/@rtsao/scc": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@rtsao/scc/-/scc-1.1.0.tgz",
+      "integrity": "sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true
+    },
     "node_modules/@schematics/angular": {
       "version": "18.1.4",
       "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-18.1.4.tgz",
@@ -4976,6 +4997,14 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/@types/json5": {
+      "version": "0.0.29",
+      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
+      "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true
+    },
     "node_modules/@types/mime": {
       "version": "1.3.5",
       "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.5.tgz",
@@ -5095,32 +5124,32 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.1.0.tgz",
-      "integrity": "sha512-LlNBaHFCEBPHyD4pZXb35mzjGkuGKXU5eeCA1SxvHfiRES0E82dOounfVpL4DCqYvJEKab0bZIA0gCRpdLKkCw==",
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.11.0.tgz",
+      "integrity": "sha512-P+qEahbgeHW4JQ/87FuItjBj8O3MYv5gELDzr8QaQ7fsll1gSMTYb6j87MYyxwf3DtD7uGFB9ShwgmCJB5KmaQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/regexpp": "^4.10.0",
-        "@typescript-eslint/scope-manager": "8.1.0",
-        "@typescript-eslint/type-utils": "8.1.0",
-        "@typescript-eslint/utils": "8.1.0",
-        "@typescript-eslint/visitor-keys": "8.1.0",
+        "@typescript-eslint/scope-manager": "7.11.0",
+        "@typescript-eslint/type-utils": "7.11.0",
+        "@typescript-eslint/utils": "7.11.0",
+        "@typescript-eslint/visitor-keys": "7.11.0",
         "graphemer": "^1.4.0",
         "ignore": "^5.3.1",
         "natural-compare": "^1.4.0",
         "ts-api-utils": "^1.3.0"
       },
       "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+        "node": "^18.18.0 || >=20.0.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "@typescript-eslint/parser": "^8.0.0 || ^8.0.0-alpha.0",
-        "eslint": "^8.57.0 || ^9.0.0"
+        "@typescript-eslint/parser": "^7.0.0",
+        "eslint": "^8.56.0"
       },
       "peerDependenciesMeta": {
         "typescript": {
@@ -5129,17 +5158,17 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.1.0.tgz",
-      "integrity": "sha512-DsuOZQji687sQUjm4N6c9xABJa7fjvfIdjqpSIIVOgaENf2jFXiM9hIBZOL3hb6DHK9Nvd2d7zZnoMLf9e0OtQ==",
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.11.0.tgz",
+      "integrity": "sha512-27tGdVEiutD4POirLZX4YzT180vevUURJl4wJGmm6TrQoiYwuxTIY98PBp6L2oN+JQxzE0URvYlzJaBHIekXAw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.1.0",
-        "@typescript-eslint/visitor-keys": "8.1.0"
+        "@typescript-eslint/types": "7.11.0",
+        "@typescript-eslint/visitor-keys": "7.11.0"
       },
       "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+        "node": "^18.18.0 || >=20.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -5147,13 +5176,13 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/types": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.1.0.tgz",
-      "integrity": "sha512-q2/Bxa0gMOu/2/AKALI0tCKbG2zppccnRIRCW6BaaTlRVaPKft4oVYPp7WOPpcnsgbr0qROAVCVKCvIQ0tbWog==",
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.11.0.tgz",
+      "integrity": "sha512-MPEsDRZTyCiXkD4vd3zywDCifi7tatc4K37KqTprCvaXptP7Xlpdw0NR2hRJTetG5TxbWDB79Ys4kLmHliEo/w==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+        "node": "^18.18.0 || >=20.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -5161,14 +5190,14 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.1.0.tgz",
-      "integrity": "sha512-NTHhmufocEkMiAord/g++gWKb0Fr34e9AExBRdqgWdVBaKoei2dIyYKD9Q0jBnvfbEA5zaf8plUFMUH6kQ0vGg==",
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.11.0.tgz",
+      "integrity": "sha512-cxkhZ2C/iyi3/6U9EPc5y+a6csqHItndvN/CzbNXTNrsC3/ASoYQZEt9uMaEp+xFNjasqQyszp5TumAVKKvJeQ==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
-        "@typescript-eslint/types": "8.1.0",
-        "@typescript-eslint/visitor-keys": "8.1.0",
+        "@typescript-eslint/types": "7.11.0",
+        "@typescript-eslint/visitor-keys": "7.11.0",
         "debug": "^4.3.4",
         "globby": "^11.1.0",
         "is-glob": "^4.0.3",
@@ -5177,7 +5206,7 @@
         "ts-api-utils": "^1.3.0"
       },
       "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+        "node": "^18.18.0 || >=20.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -5190,40 +5219,40 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/utils": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.1.0.tgz",
-      "integrity": "sha512-ypRueFNKTIFwqPeJBfeIpxZ895PQhNyH4YID6js0UoBImWYoSjBsahUn9KMiJXh94uOjVBgHD9AmkyPsPnFwJA==",
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.11.0.tgz",
+      "integrity": "sha512-xlAWwPleNRHwF37AhrZurOxA1wyXowW4PqVXZVUNCLjB48CqdPJoJWkrpH2nij9Q3Lb7rtWindtoXwxjxlKKCA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
-        "@typescript-eslint/scope-manager": "8.1.0",
-        "@typescript-eslint/types": "8.1.0",
-        "@typescript-eslint/typescript-estree": "8.1.0"
+        "@typescript-eslint/scope-manager": "7.11.0",
+        "@typescript-eslint/types": "7.11.0",
+        "@typescript-eslint/typescript-estree": "7.11.0"
       },
       "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+        "node": "^18.18.0 || >=20.0.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "eslint": "^8.57.0 || ^9.0.0"
+        "eslint": "^8.56.0"
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.1.0.tgz",
-      "integrity": "sha512-ba0lNI19awqZ5ZNKh6wCModMwoZs457StTebQ0q1NP58zSi2F6MOZRXwfKZy+jB78JNJ/WH8GSh2IQNzXX8Nag==",
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.11.0.tgz",
+      "integrity": "sha512-7syYk4MzjxTEk0g/w3iqtgxnFQspDJfn6QKD36xMuuhTzjcxY7F8EmBLnALjVyaOF1/bVocu3bS/2/F7rXrveQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.1.0",
+        "@typescript-eslint/types": "7.11.0",
         "eslint-visitor-keys": "^3.4.3"
       },
       "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+        "node": "^18.18.0 || >=20.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -5288,27 +5317,27 @@
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.1.0.tgz",
-      "integrity": "sha512-U7iTAtGgJk6DPX9wIWPPOlt1gO57097G06gIcl0N0EEnNw8RGD62c+2/DiP/zL7KrkqnnqF7gtFGR7YgzPllTA==",
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.11.0.tgz",
+      "integrity": "sha512-yimw99teuaXVWsBcPO1Ais02kwJ1jmNA1KxE7ng0aT7ndr1pT1wqj0OJnsYVGKKlc4QJai86l/025L6z8CljOg==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
-        "@typescript-eslint/scope-manager": "8.1.0",
-        "@typescript-eslint/types": "8.1.0",
-        "@typescript-eslint/typescript-estree": "8.1.0",
-        "@typescript-eslint/visitor-keys": "8.1.0",
+        "@typescript-eslint/scope-manager": "7.11.0",
+        "@typescript-eslint/types": "7.11.0",
+        "@typescript-eslint/typescript-estree": "7.11.0",
+        "@typescript-eslint/visitor-keys": "7.11.0",
         "debug": "^4.3.4"
       },
       "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+        "node": "^18.18.0 || >=20.0.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "eslint": "^8.57.0 || ^9.0.0"
+        "eslint": "^8.56.0"
       },
       "peerDependenciesMeta": {
         "typescript": {
@@ -5317,17 +5346,17 @@
       }
     },
     "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.1.0.tgz",
-      "integrity": "sha512-DsuOZQji687sQUjm4N6c9xABJa7fjvfIdjqpSIIVOgaENf2jFXiM9hIBZOL3hb6DHK9Nvd2d7zZnoMLf9e0OtQ==",
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.11.0.tgz",
+      "integrity": "sha512-27tGdVEiutD4POirLZX4YzT180vevUURJl4wJGmm6TrQoiYwuxTIY98PBp6L2oN+JQxzE0URvYlzJaBHIekXAw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.1.0",
-        "@typescript-eslint/visitor-keys": "8.1.0"
+        "@typescript-eslint/types": "7.11.0",
+        "@typescript-eslint/visitor-keys": "7.11.0"
       },
       "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+        "node": "^18.18.0 || >=20.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -5335,13 +5364,13 @@
       }
     },
     "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.1.0.tgz",
-      "integrity": "sha512-q2/Bxa0gMOu/2/AKALI0tCKbG2zppccnRIRCW6BaaTlRVaPKft4oVYPp7WOPpcnsgbr0qROAVCVKCvIQ0tbWog==",
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.11.0.tgz",
+      "integrity": "sha512-MPEsDRZTyCiXkD4vd3zywDCifi7tatc4K37KqTprCvaXptP7Xlpdw0NR2hRJTetG5TxbWDB79Ys4kLmHliEo/w==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+        "node": "^18.18.0 || >=20.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -5349,14 +5378,14 @@
       }
     },
     "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.1.0.tgz",
-      "integrity": "sha512-NTHhmufocEkMiAord/g++gWKb0Fr34e9AExBRdqgWdVBaKoei2dIyYKD9Q0jBnvfbEA5zaf8plUFMUH6kQ0vGg==",
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.11.0.tgz",
+      "integrity": "sha512-cxkhZ2C/iyi3/6U9EPc5y+a6csqHItndvN/CzbNXTNrsC3/ASoYQZEt9uMaEp+xFNjasqQyszp5TumAVKKvJeQ==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
-        "@typescript-eslint/types": "8.1.0",
-        "@typescript-eslint/visitor-keys": "8.1.0",
+        "@typescript-eslint/types": "7.11.0",
+        "@typescript-eslint/visitor-keys": "7.11.0",
         "debug": "^4.3.4",
         "globby": "^11.1.0",
         "is-glob": "^4.0.3",
@@ -5365,7 +5394,7 @@
         "ts-api-utils": "^1.3.0"
       },
       "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+        "node": "^18.18.0 || >=20.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -5378,17 +5407,17 @@
       }
     },
     "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.1.0.tgz",
-      "integrity": "sha512-ba0lNI19awqZ5ZNKh6wCModMwoZs457StTebQ0q1NP58zSi2F6MOZRXwfKZy+jB78JNJ/WH8GSh2IQNzXX8Nag==",
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.11.0.tgz",
+      "integrity": "sha512-7syYk4MzjxTEk0g/w3iqtgxnFQspDJfn6QKD36xMuuhTzjcxY7F8EmBLnALjVyaOF1/bVocu3bS/2/F7rXrveQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.1.0",
+        "@typescript-eslint/types": "7.11.0",
         "eslint-visitor-keys": "^3.4.3"
       },
       "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+        "node": "^18.18.0 || >=20.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -5453,15 +5482,15 @@
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.3.0.tgz",
-      "integrity": "sha512-mz2X8WcN2nVu5Hodku+IR8GgCOl4C0G/Z1ruaWN4dgec64kDBabuXyPAr+/RgJtumv8EEkqIzf3X2U5DUKB2eg==",
+      "version": "8.10.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.10.0.tgz",
+      "integrity": "sha512-AgCaEjhfql9MDKjMUxWvH7HjLeBqMCBfIaBbzzIcBbQPZE7CPh1m6FF+L75NUMJFMLYhCywJXIDEMa3//1A0dw==",
       "dev": true,
       "license": "MIT",
       "peer": true,
       "dependencies": {
-        "@typescript-eslint/types": "8.3.0",
-        "@typescript-eslint/visitor-keys": "8.3.0"
+        "@typescript-eslint/types": "8.10.0",
+        "@typescript-eslint/visitor-keys": "8.10.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -5472,24 +5501,27 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.1.0.tgz",
-      "integrity": "sha512-oLYvTxljVvsMnldfl6jIKxTaU7ok7km0KDrwOt1RHYu6nxlhN3TIx8k5Q52L6wR33nOwDgM7VwW1fT1qMNfFIA==",
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.11.0.tgz",
+      "integrity": "sha512-WmppUEgYy+y1NTseNMJ6mCFxt03/7jTOy08bcg7bxJJdsM4nuhnchyBbE8vryveaJUf62noH7LodPSo5Z0WUCg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "8.1.0",
-        "@typescript-eslint/utils": "8.1.0",
+        "@typescript-eslint/typescript-estree": "7.11.0",
+        "@typescript-eslint/utils": "7.11.0",
         "debug": "^4.3.4",
         "ts-api-utils": "^1.3.0"
       },
       "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+        "node": "^18.18.0 || >=20.0.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       },
+      "peerDependencies": {
+        "eslint": "^8.56.0"
+      },
       "peerDependenciesMeta": {
         "typescript": {
           "optional": true
@@ -5497,17 +5529,17 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.1.0.tgz",
-      "integrity": "sha512-DsuOZQji687sQUjm4N6c9xABJa7fjvfIdjqpSIIVOgaENf2jFXiM9hIBZOL3hb6DHK9Nvd2d7zZnoMLf9e0OtQ==",
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.11.0.tgz",
+      "integrity": "sha512-27tGdVEiutD4POirLZX4YzT180vevUURJl4wJGmm6TrQoiYwuxTIY98PBp6L2oN+JQxzE0URvYlzJaBHIekXAw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.1.0",
-        "@typescript-eslint/visitor-keys": "8.1.0"
+        "@typescript-eslint/types": "7.11.0",
+        "@typescript-eslint/visitor-keys": "7.11.0"
       },
       "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+        "node": "^18.18.0 || >=20.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -5515,13 +5547,13 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/types": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.1.0.tgz",
-      "integrity": "sha512-q2/Bxa0gMOu/2/AKALI0tCKbG2zppccnRIRCW6BaaTlRVaPKft4oVYPp7WOPpcnsgbr0qROAVCVKCvIQ0tbWog==",
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.11.0.tgz",
+      "integrity": "sha512-MPEsDRZTyCiXkD4vd3zywDCifi7tatc4K37KqTprCvaXptP7Xlpdw0NR2hRJTetG5TxbWDB79Ys4kLmHliEo/w==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+        "node": "^18.18.0 || >=20.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -5529,14 +5561,14 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.1.0.tgz",
-      "integrity": "sha512-NTHhmufocEkMiAord/g++gWKb0Fr34e9AExBRdqgWdVBaKoei2dIyYKD9Q0jBnvfbEA5zaf8plUFMUH6kQ0vGg==",
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.11.0.tgz",
+      "integrity": "sha512-cxkhZ2C/iyi3/6U9EPc5y+a6csqHItndvN/CzbNXTNrsC3/ASoYQZEt9uMaEp+xFNjasqQyszp5TumAVKKvJeQ==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
-        "@typescript-eslint/types": "8.1.0",
-        "@typescript-eslint/visitor-keys": "8.1.0",
+        "@typescript-eslint/types": "7.11.0",
+        "@typescript-eslint/visitor-keys": "7.11.0",
         "debug": "^4.3.4",
         "globby": "^11.1.0",
         "is-glob": "^4.0.3",
@@ -5545,7 +5577,7 @@
         "ts-api-utils": "^1.3.0"
       },
       "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+        "node": "^18.18.0 || >=20.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -5558,40 +5590,40 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/utils": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.1.0.tgz",
-      "integrity": "sha512-ypRueFNKTIFwqPeJBfeIpxZ895PQhNyH4YID6js0UoBImWYoSjBsahUn9KMiJXh94uOjVBgHD9AmkyPsPnFwJA==",
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.11.0.tgz",
+      "integrity": "sha512-xlAWwPleNRHwF37AhrZurOxA1wyXowW4PqVXZVUNCLjB48CqdPJoJWkrpH2nij9Q3Lb7rtWindtoXwxjxlKKCA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
-        "@typescript-eslint/scope-manager": "8.1.0",
-        "@typescript-eslint/types": "8.1.0",
-        "@typescript-eslint/typescript-estree": "8.1.0"
+        "@typescript-eslint/scope-manager": "7.11.0",
+        "@typescript-eslint/types": "7.11.0",
+        "@typescript-eslint/typescript-estree": "7.11.0"
       },
       "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+        "node": "^18.18.0 || >=20.0.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "eslint": "^8.57.0 || ^9.0.0"
+        "eslint": "^8.56.0"
       }
     },
     "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.1.0.tgz",
-      "integrity": "sha512-ba0lNI19awqZ5ZNKh6wCModMwoZs457StTebQ0q1NP58zSi2F6MOZRXwfKZy+jB78JNJ/WH8GSh2IQNzXX8Nag==",
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.11.0.tgz",
+      "integrity": "sha512-7syYk4MzjxTEk0g/w3iqtgxnFQspDJfn6QKD36xMuuhTzjcxY7F8EmBLnALjVyaOF1/bVocu3bS/2/F7rXrveQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.1.0",
+        "@typescript-eslint/types": "7.11.0",
         "eslint-visitor-keys": "^3.4.3"
       },
       "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+        "node": "^18.18.0 || >=20.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -5656,9 +5688,9 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.3.0.tgz",
-      "integrity": "sha512-y6sSEeK+facMaAyixM36dQ5NVXTnKWunfD1Ft4xraYqxP0lC0POJmIaL/mw72CUMqjY9qfyVfXafMeaUj0noWw==",
+      "version": "8.10.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.10.0.tgz",
+      "integrity": "sha512-k/E48uzsfJCRRbGLapdZgrX52csmWJ2rcowwPvOZ8lwPUv3xW6CcFeJAXgx4uJm+Ge4+a4tFOkdYvSpxhRhg1w==",
       "dev": true,
       "license": "MIT",
       "peer": true,
@@ -5671,15 +5703,15 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.3.0.tgz",
-      "integrity": "sha512-Mq7FTHl0R36EmWlCJWojIC1qn/ZWo2YiWYc1XVtasJ7FIgjo0MVv9rZWXEE7IK2CGrtwe1dVOxWwqXUdNgfRCA==",
+      "version": "8.10.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.10.0.tgz",
+      "integrity": "sha512-3OE0nlcOHaMvQ8Xu5gAfME3/tWVDpb/HxtpUZ1WeOAksZ/h/gwrBzCklaGzwZT97/lBbbxJ16dMA98JMEngW4w==",
       "dev": true,
       "license": "BSD-2-Clause",
       "peer": true,
       "dependencies": {
-        "@typescript-eslint/types": "8.3.0",
-        "@typescript-eslint/visitor-keys": "8.3.0",
+        "@typescript-eslint/types": "8.10.0",
+        "@typescript-eslint/visitor-keys": "8.10.0",
         "debug": "^4.3.4",
         "fast-glob": "^3.3.2",
         "is-glob": "^4.0.3",
@@ -5729,17 +5761,17 @@
       }
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.3.0.tgz",
-      "integrity": "sha512-F77WwqxIi/qGkIGOGXNBLV7nykwfjLsdauRB/DOFPdv6LTF3BHHkBpq81/b5iMPSF055oO2BiivDJV4ChvNtXA==",
+      "version": "8.10.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.10.0.tgz",
+      "integrity": "sha512-Oq4uZ7JFr9d1ZunE/QKy5egcDRXT/FrS2z/nlxzPua2VHFtmMvFNDvpq1m/hq0ra+T52aUezfcjGRIB7vNJF9w==",
       "dev": true,
       "license": "MIT",
       "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
-        "@typescript-eslint/scope-manager": "8.3.0",
-        "@typescript-eslint/types": "8.3.0",
-        "@typescript-eslint/typescript-estree": "8.3.0"
+        "@typescript-eslint/scope-manager": "8.10.0",
+        "@typescript-eslint/types": "8.10.0",
+        "@typescript-eslint/typescript-estree": "8.10.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -5753,14 +5785,14 @@
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.3.0.tgz",
-      "integrity": "sha512-RmZwrTbQ9QveF15m/Cl28n0LXD6ea2CjkhH5rQ55ewz3H24w+AMCJHPVYaZ8/0HoG8Z3cLLFFycRXxeO2tz9FA==",
+      "version": "8.10.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.10.0.tgz",
+      "integrity": "sha512-k8nekgqwr7FadWk548Lfph6V3r9OVqjzAIVskE7orMZR23cGJjAOVazsZSJW+ElyjfTM4wx/1g88Mi70DDtG9A==",
       "dev": true,
       "license": "MIT",
       "peer": true,
       "dependencies": {
-        "@typescript-eslint/types": "8.3.0",
+        "@typescript-eslint/types": "8.10.0",
         "eslint-visitor-keys": "^3.4.3"
       },
       "engines": {
@@ -5771,6 +5803,13 @@
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
+    "node_modules/@ungap/structured-clone": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz",
+      "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==",
+      "dev": true,
+      "license": "ISC"
+    },
     "node_modules/@vitejs/plugin-basic-ssl": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@vitejs/plugin-basic-ssl/-/plugin-basic-ssl-1.1.0.tgz",
@@ -6251,12 +6290,52 @@
         "dequal": "^2.0.3"
       }
     },
+    "node_modules/array-buffer-byte-length": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz",
+      "integrity": "sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "call-bind": "^1.0.5",
+        "is-array-buffer": "^3.0.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/array-flatten": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
       "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==",
       "license": "MIT"
     },
+    "node_modules/array-includes": {
+      "version": "3.1.8",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.8.tgz",
+      "integrity": "sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2",
+        "es-object-atoms": "^1.0.0",
+        "get-intrinsic": "^1.2.4",
+        "is-string": "^1.0.7"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/array-union": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
@@ -6267,6 +6346,92 @@
         "node": ">=8"
       }
     },
+    "node_modules/array.prototype.findlastindex": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.5.tgz",
+      "integrity": "sha512-zfETvRFA8o7EiNn++N5f/kaCw221hrpGsDmcpndVupkPzEc1Wuf3VgC0qby1BbHs7f5DVYjgtEU2LLh5bqeGfQ==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0",
+        "es-shim-unscopables": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array.prototype.flat": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz",
+      "integrity": "sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
+        "es-shim-unscopables": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array.prototype.flatmap": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz",
+      "integrity": "sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
+        "es-shim-unscopables": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/arraybuffer.prototype.slice": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz",
+      "integrity": "sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "array-buffer-byte-length": "^1.0.1",
+        "call-bind": "^1.0.5",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.22.3",
+        "es-errors": "^1.2.1",
+        "get-intrinsic": "^1.2.3",
+        "is-array-buffer": "^3.0.4",
+        "is-shared-array-buffer": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/autoprefixer": {
       "version": "10.4.19",
       "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.19.tgz",
@@ -6305,9 +6470,26 @@
         "postcss": "^8.1.0"
       }
     },
-    "node_modules/axobject-query": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-4.1.0.tgz",
+    "node_modules/available-typed-arrays": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz",
+      "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "possible-typed-array-names": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/axobject-query": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-4.1.0.tgz",
       "integrity": "sha512-qIj0G9wZbMGNLjLmg1PT6v2mE9AH2zlnADJD/2tC6E00hgmhUOfEB6greHPAfLRSufHqROIUTkw6E+M3lH0PTQ==",
       "dev": true,
       "license": "Apache-2.0",
@@ -6466,9 +6648,9 @@
       }
     },
     "node_modules/body-parser": {
-      "version": "1.20.2",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz",
-      "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==",
+      "version": "1.20.3",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz",
+      "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==",
       "license": "MIT",
       "dependencies": {
         "bytes": "3.1.2",
@@ -6479,7 +6661,7 @@
         "http-errors": "2.0.0",
         "iconv-lite": "0.4.24",
         "on-finished": "2.4.1",
-        "qs": "6.11.0",
+        "qs": "6.13.0",
         "raw-body": "2.5.2",
         "type-is": "~1.6.18",
         "unpipe": "1.0.0"
@@ -7133,6 +7315,13 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/confusing-browser-globals": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz",
+      "integrity": "sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/connect": {
       "version": "3.7.0",
       "resolved": "https://registry.npmjs.org/connect/-/connect-3.7.0.tgz",
@@ -7247,9 +7436,10 @@
       "license": "MIT"
     },
     "node_modules/cookie": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz",
-      "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==",
+      "version": "0.7.2",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz",
+      "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 0.6"
@@ -7574,6 +7764,63 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/data-view-buffer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.1.tgz",
+      "integrity": "sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "call-bind": "^1.0.6",
+        "es-errors": "^1.3.0",
+        "is-data-view": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/data-view-byte-length": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.1.tgz",
+      "integrity": "sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "es-errors": "^1.3.0",
+        "is-data-view": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/data-view-byte-offset": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.0.tgz",
+      "integrity": "sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "call-bind": "^1.0.6",
+        "es-errors": "^1.3.0",
+        "is-data-view": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/date-format": {
       "version": "4.0.14",
       "resolved": "https://registry.npmjs.org/date-format/-/date-format-4.0.14.tgz",
@@ -7694,6 +7941,24 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/define-properties": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz",
+      "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "define-data-property": "^1.0.1",
+        "has-property-descriptors": "^1.0.0",
+        "object-keys": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/depd": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
@@ -7783,6 +8048,20 @@
         "node": ">=6"
       }
     },
+    "node_modules/doctrine": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "peer": true,
+      "dependencies": {
+        "esutils": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/dom-serialize": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/dom-serialize/-/dom-serialize-2.2.1.tgz",
@@ -7923,9 +8202,9 @@
       }
     },
     "node_modules/engine.io": {
-      "version": "6.5.5",
-      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.5.5.tgz",
-      "integrity": "sha512-C5Pn8Wk+1vKBoHghJODM63yk8MvrO9EWZUfkAt5HAqIgPE4/8FF0PEGHXtEd40l223+cE5ABWuPzm38PHFXfMA==",
+      "version": "6.6.2",
+      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.6.2.tgz",
+      "integrity": "sha512-gmNvsYi9C8iErnZdVcJnvCpSKbWTt1E8+JZo8b+daLninywUWi5NQ5STSHZ9rFjFO7imNcvb8Pc5pe/wMR5xEw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -7934,7 +8213,7 @@
         "@types/node": ">=10.0.0",
         "accepts": "~1.3.4",
         "base64id": "2.0.0",
-        "cookie": "~0.4.1",
+        "cookie": "~0.7.2",
         "cors": "~2.8.5",
         "debug": "~4.3.1",
         "engine.io-parser": "~5.2.1",
@@ -7966,16 +8245,6 @@
         "node": ">=10.0.0"
       }
     },
-    "node_modules/engine.io/node_modules/cookie": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz",
-      "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
     "node_modules/enhanced-resolve": {
       "version": "5.17.1",
       "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz",
@@ -8069,6 +8338,68 @@
         "is-arrayish": "^0.2.1"
       }
     },
+    "node_modules/es-abstract": {
+      "version": "1.23.3",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.3.tgz",
+      "integrity": "sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "array-buffer-byte-length": "^1.0.1",
+        "arraybuffer.prototype.slice": "^1.0.3",
+        "available-typed-arrays": "^1.0.7",
+        "call-bind": "^1.0.7",
+        "data-view-buffer": "^1.0.1",
+        "data-view-byte-length": "^1.0.1",
+        "data-view-byte-offset": "^1.0.0",
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0",
+        "es-set-tostringtag": "^2.0.3",
+        "es-to-primitive": "^1.2.1",
+        "function.prototype.name": "^1.1.6",
+        "get-intrinsic": "^1.2.4",
+        "get-symbol-description": "^1.0.2",
+        "globalthis": "^1.0.3",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.2",
+        "has-proto": "^1.0.3",
+        "has-symbols": "^1.0.3",
+        "hasown": "^2.0.2",
+        "internal-slot": "^1.0.7",
+        "is-array-buffer": "^3.0.4",
+        "is-callable": "^1.2.7",
+        "is-data-view": "^1.0.1",
+        "is-negative-zero": "^2.0.3",
+        "is-regex": "^1.1.4",
+        "is-shared-array-buffer": "^1.0.3",
+        "is-string": "^1.0.7",
+        "is-typed-array": "^1.1.13",
+        "is-weakref": "^1.0.2",
+        "object-inspect": "^1.13.1",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.5",
+        "regexp.prototype.flags": "^1.5.2",
+        "safe-array-concat": "^1.1.2",
+        "safe-regex-test": "^1.0.3",
+        "string.prototype.trim": "^1.2.9",
+        "string.prototype.trimend": "^1.0.8",
+        "string.prototype.trimstart": "^1.0.8",
+        "typed-array-buffer": "^1.0.2",
+        "typed-array-byte-length": "^1.0.1",
+        "typed-array-byte-offset": "^1.0.2",
+        "typed-array-length": "^1.0.6",
+        "unbox-primitive": "^1.0.2",
+        "which-typed-array": "^1.1.15"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/es-define-property": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
@@ -8097,6 +8428,65 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/es-object-atoms": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.0.0.tgz",
+      "integrity": "sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-set-tostringtag": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz",
+      "integrity": "sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "get-intrinsic": "^1.2.4",
+        "has-tostringtag": "^1.0.2",
+        "hasown": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-shim-unscopables": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz",
+      "integrity": "sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "hasown": "^2.0.0"
+      }
+    },
+    "node_modules/es-to-primitive": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "is-callable": "^1.1.4",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/esbuild": {
       "version": "0.21.5",
       "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz",
@@ -8176,38 +8566,43 @@
       }
     },
     "node_modules/eslint": {
-      "version": "9.9.1",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.9.1.tgz",
-      "integrity": "sha512-dHvhrbfr4xFQ9/dq+jcVneZMyRYLjggWjk6RVsIiHsP8Rz6yZ8LvZ//iU4TrZF+SXWG+JkNF2OyiZRvzgRDqMg==",
+      "version": "8.57.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz",
+      "integrity": "sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==",
+      "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
-        "@eslint-community/regexpp": "^4.11.0",
-        "@eslint/config-array": "^0.18.0",
-        "@eslint/eslintrc": "^3.1.0",
-        "@eslint/js": "9.9.1",
+        "@eslint-community/regexpp": "^4.6.1",
+        "@eslint/eslintrc": "^2.1.4",
+        "@eslint/js": "8.57.0",
+        "@humanwhocodes/config-array": "^0.11.14",
         "@humanwhocodes/module-importer": "^1.0.1",
-        "@humanwhocodes/retry": "^0.3.0",
         "@nodelib/fs.walk": "^1.2.8",
+        "@ungap/structured-clone": "^1.2.0",
         "ajv": "^6.12.4",
         "chalk": "^4.0.0",
         "cross-spawn": "^7.0.2",
         "debug": "^4.3.2",
+        "doctrine": "^3.0.0",
         "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^8.0.2",
-        "eslint-visitor-keys": "^4.0.0",
-        "espree": "^10.1.0",
-        "esquery": "^1.5.0",
+        "eslint-scope": "^7.2.2",
+        "eslint-visitor-keys": "^3.4.3",
+        "espree": "^9.6.1",
+        "esquery": "^1.4.2",
         "esutils": "^2.0.2",
         "fast-deep-equal": "^3.1.3",
-        "file-entry-cache": "^8.0.0",
+        "file-entry-cache": "^6.0.1",
         "find-up": "^5.0.0",
         "glob-parent": "^6.0.2",
+        "globals": "^13.19.0",
+        "graphemer": "^1.4.0",
         "ignore": "^5.2.0",
         "imurmurhash": "^0.1.4",
         "is-glob": "^4.0.0",
         "is-path-inside": "^3.0.3",
+        "js-yaml": "^4.1.0",
         "json-stable-stringify-without-jsonify": "^1.0.1",
         "levn": "^0.4.1",
         "lodash.merge": "^4.6.2",
@@ -8221,16 +8616,190 @@
         "eslint": "bin/eslint.js"
       },
       "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
       "funding": {
-        "url": "https://eslint.org/donate"
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/eslint-config-airbnb-base": {
+      "version": "15.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-15.0.0.tgz",
+      "integrity": "sha512-xaX3z4ZZIcFLvh2oUNvcX5oEofXda7giYmuplVxoOg5A7EXJMrUyqRgR+mhDhPK8LZ4PttFOBvCYDbX3sUoUig==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "confusing-browser-globals": "^1.0.10",
+        "object.assign": "^4.1.2",
+        "object.entries": "^1.1.5",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
       },
       "peerDependencies": {
-        "jiti": "*"
+        "eslint": "^7.32.0 || ^8.2.0",
+        "eslint-plugin-import": "^2.25.2"
+      }
+    },
+    "node_modules/eslint-config-airbnb-base/node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/eslint-config-airbnb-typescript": {
+      "version": "18.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-airbnb-typescript/-/eslint-config-airbnb-typescript-18.0.0.tgz",
+      "integrity": "sha512-oc+Lxzgzsu8FQyFVa4QFaVKiitTYiiW3frB9KYW5OWdPrqFc7FzxgB20hP4cHMlr+MBzGcLl3jnCOVOydL9mIg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "eslint-config-airbnb-base": "^15.0.0"
+      },
+      "peerDependencies": {
+        "@typescript-eslint/eslint-plugin": "^7.0.0",
+        "@typescript-eslint/parser": "^7.0.0",
+        "eslint": "^8.56.0"
+      }
+    },
+    "node_modules/eslint-import-resolver-node": {
+      "version": "0.3.9",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz",
+      "integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "debug": "^3.2.7",
+        "is-core-module": "^2.13.0",
+        "resolve": "^1.22.4"
+      }
+    },
+    "node_modules/eslint-import-resolver-node/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/eslint-module-utils": {
+      "version": "2.12.0",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.12.0.tgz",
+      "integrity": "sha512-wALZ0HFoytlyh/1+4wuZ9FJCD/leWHQzzrxJ8+rebyReSLk7LApMyd3WJaLVoN+D5+WIdJyDK1c6JnE65V4Zyg==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "debug": "^3.2.7"
+      },
+      "engines": {
+        "node": ">=4"
+      },
+      "peerDependenciesMeta": {
+        "eslint": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/eslint-module-utils/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/eslint-plugin-import": {
+      "version": "2.31.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.31.0.tgz",
+      "integrity": "sha512-ixmkI62Rbc2/w8Vfxyh1jQRTdRTF52VxwRVHl/ykPAmqG+Nb7/kNn+byLP0LxPgI7zWA16Jt82SybJInmMia3A==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@rtsao/scc": "^1.1.0",
+        "array-includes": "^3.1.8",
+        "array.prototype.findlastindex": "^1.2.5",
+        "array.prototype.flat": "^1.3.2",
+        "array.prototype.flatmap": "^1.3.2",
+        "debug": "^3.2.7",
+        "doctrine": "^2.1.0",
+        "eslint-import-resolver-node": "^0.3.9",
+        "eslint-module-utils": "^2.12.0",
+        "hasown": "^2.0.2",
+        "is-core-module": "^2.15.1",
+        "is-glob": "^4.0.3",
+        "minimatch": "^3.1.2",
+        "object.fromentries": "^2.0.8",
+        "object.groupby": "^1.0.3",
+        "object.values": "^1.2.0",
+        "semver": "^6.3.1",
+        "string.prototype.trimend": "^1.0.8",
+        "tsconfig-paths": "^3.15.0"
+      },
+      "engines": {
+        "node": ">=4"
+      },
+      "peerDependencies": {
+        "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 || ^9"
+      }
+    },
+    "node_modules/eslint-plugin-import/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/eslint-plugin-import/node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "dev": true,
+      "license": "ISC",
+      "peer": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/eslint-plugin-simple-import-sort": {
+      "version": "12.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-simple-import-sort/-/eslint-plugin-simple-import-sort-12.1.1.tgz",
+      "integrity": "sha512-6nuzu4xwQtE3332Uz0to+TxDQYRLTKRESSc2hefVT48Zc8JthmN23Gx9lnYhu0FtkRSL1oxny3kJ2aveVhmOVA==",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "eslint": ">=5.0.0"
+      }
+    },
+    "node_modules/eslint-plugin-unused-imports": {
+      "version": "4.1.4",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-unused-imports/-/eslint-plugin-unused-imports-4.1.4.tgz",
+      "integrity": "sha512-YptD6IzQjDardkl0POxnnRBhU1OEePMV0nd6siHaRBbd+lyh6NAhFEobiznKU7kTsSsDeSD62Pe7kAM1b7dAZQ==",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "@typescript-eslint/eslint-plugin": "^8.0.0-0 || ^7.0.0 || ^6.0.0 || ^5.0.0",
+        "eslint": "^9.0.0 || ^8.0.0"
       },
       "peerDependenciesMeta": {
-        "jiti": {
+        "@typescript-eslint/eslint-plugin": {
           "optional": true
         }
       }
@@ -8262,6 +8831,16 @@
         "url": "https://opencollective.com/eslint"
       }
     },
+    "node_modules/eslint/node_modules/@eslint/js": {
+      "version": "8.57.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.0.tgz",
+      "integrity": "sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      }
+    },
     "node_modules/eslint/node_modules/ajv": {
       "version": "6.12.6",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
@@ -8332,6 +8911,19 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/eslint/node_modules/doctrine": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "esutils": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
     "node_modules/eslint/node_modules/escape-string-regexp": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
@@ -8346,9 +8938,9 @@
       }
     },
     "node_modules/eslint/node_modules/eslint-scope": {
-      "version": "8.0.2",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.0.2.tgz",
-      "integrity": "sha512-6E4xmrTw5wtxnLA5wYL3WDfhZ/1bUBGOXV0zQvVRDOtrR8D0p6W7fs3JweNYhwRYeGvd/1CKX2se0/2s7Q/nJA==",
+      "version": "7.2.2",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
+      "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
@@ -8356,20 +8948,7 @@
         "estraverse": "^5.2.0"
       },
       "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/eslint/node_modules/eslint-visitor-keys": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.0.0.tgz",
-      "integrity": "sha512-OtIRv/2GyiF6o/d8K7MYKKbXrOUBIK6SfkIRM4Z0dY3w+LiQ0vy3F57m0Z71bjbyeiWFiHJ8brqnmE6H6/jEuw==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
       "funding": {
         "url": "https://opencollective.com/eslint"
@@ -8415,6 +8994,22 @@
         "node": ">=10.13.0"
       }
     },
+    "node_modules/eslint/node_modules/globals": {
+      "version": "13.24.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
+      "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "type-fest": "^0.20.2"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/eslint/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -8503,6 +9098,19 @@
         "node": ">=8"
       }
     },
+    "node_modules/eslint/node_modules/type-fest": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+      "dev": true,
+      "license": "(MIT OR CC0-1.0)",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/eslint/node_modules/yocto-queue": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
@@ -8517,31 +9125,18 @@
       }
     },
     "node_modules/espree": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-10.1.0.tgz",
-      "integrity": "sha512-M1M6CpiE6ffoigIOWYO9UDP8TMUw9kqb21tf+08IgDYjCsOvCuDt4jQcZmoYxx+w7zlKw9/N0KXfto+I8/FrXA==",
+      "version": "9.6.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
+      "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
-        "acorn": "^8.12.0",
+        "acorn": "^8.9.0",
         "acorn-jsx": "^5.3.2",
-        "eslint-visitor-keys": "^4.0.0"
+        "eslint-visitor-keys": "^3.4.1"
       },
       "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/espree/node_modules/eslint-visitor-keys": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.0.0.tgz",
-      "integrity": "sha512-OtIRv/2GyiF6o/d8K7MYKKbXrOUBIK6SfkIRM4Z0dY3w+LiQ0vy3F57m0Z71bjbyeiWFiHJ8brqnmE6H6/jEuw==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
       "funding": {
         "url": "https://opencollective.com/eslint"
@@ -8694,37 +9289,37 @@
       "license": "Apache-2.0"
     },
     "node_modules/express": {
-      "version": "4.19.2",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.19.2.tgz",
-      "integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==",
+      "version": "4.21.1",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.21.1.tgz",
+      "integrity": "sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==",
       "license": "MIT",
       "dependencies": {
         "accepts": "~1.3.8",
         "array-flatten": "1.1.1",
-        "body-parser": "1.20.2",
+        "body-parser": "1.20.3",
         "content-disposition": "0.5.4",
         "content-type": "~1.0.4",
-        "cookie": "0.6.0",
+        "cookie": "0.7.1",
         "cookie-signature": "1.0.6",
         "debug": "2.6.9",
         "depd": "2.0.0",
-        "encodeurl": "~1.0.2",
+        "encodeurl": "~2.0.0",
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
-        "finalhandler": "1.2.0",
+        "finalhandler": "1.3.1",
         "fresh": "0.5.2",
         "http-errors": "2.0.0",
-        "merge-descriptors": "1.0.1",
+        "merge-descriptors": "1.0.3",
         "methods": "~1.1.2",
         "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
-        "path-to-regexp": "0.1.7",
+        "path-to-regexp": "0.1.10",
         "proxy-addr": "~2.0.7",
-        "qs": "6.11.0",
+        "qs": "6.13.0",
         "range-parser": "~1.2.1",
         "safe-buffer": "5.2.1",
-        "send": "0.18.0",
-        "serve-static": "1.15.0",
+        "send": "0.19.0",
+        "serve-static": "1.16.2",
         "setprototypeof": "1.2.0",
         "statuses": "2.0.1",
         "type-is": "~1.6.18",
@@ -8735,6 +9330,15 @@
         "node": ">= 0.10.0"
       }
     },
+    "node_modules/express/node_modules/cookie": {
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz",
+      "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
     "node_modules/express/node_modules/debug": {
       "version": "2.6.9",
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
@@ -8744,6 +9348,15 @@
         "ms": "2.0.0"
       }
     },
+    "node_modules/express/node_modules/encodeurl": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
+      "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/express/node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
@@ -8834,16 +9447,16 @@
       }
     },
     "node_modules/file-entry-cache": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz",
-      "integrity": "sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
+      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "flat-cache": "^4.0.0"
+        "flat-cache": "^3.0.4"
       },
       "engines": {
-        "node": ">=16.0.0"
+        "node": "^10.12.0 || >=12.0.0"
       }
     },
     "node_modules/fill-range": {
@@ -8860,13 +9473,13 @@
       }
     },
     "node_modules/finalhandler": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
-      "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz",
+      "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==",
       "license": "MIT",
       "dependencies": {
         "debug": "2.6.9",
-        "encodeurl": "~1.0.2",
+        "encodeurl": "~2.0.0",
         "escape-html": "~1.0.3",
         "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
@@ -8886,6 +9499,15 @@
         "ms": "2.0.0"
       }
     },
+    "node_modules/finalhandler/node_modules/encodeurl": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
+      "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/finalhandler/node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
@@ -8937,17 +9559,18 @@
       }
     },
     "node_modules/flat-cache": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-4.0.1.tgz",
-      "integrity": "sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz",
+      "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "flatted": "^3.2.9",
-        "keyv": "^4.5.4"
+        "keyv": "^4.5.3",
+        "rimraf": "^3.0.2"
       },
       "engines": {
-        "node": ">=16"
+        "node": "^10.12.0 || >=12.0.0"
       }
     },
     "node_modules/flatted": {
@@ -8978,6 +9601,17 @@
         }
       }
     },
+    "node_modules/for-each": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
+      "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "is-callable": "^1.1.3"
+      }
+    },
     "node_modules/foreground-child": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.0.tgz",
@@ -9086,6 +9720,37 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/function.prototype.name": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz",
+      "integrity": "sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
+        "functions-have-names": "^1.2.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/functions-have-names": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
+      "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/gensync": {
       "version": "1.0.0-beta.2",
       "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
@@ -9151,6 +9816,25 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/get-symbol-description": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.2.tgz",
+      "integrity": "sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "call-bind": "^1.0.5",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/glob": {
       "version": "7.2.3",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
@@ -9203,6 +9887,24 @@
         "node": ">=4"
       }
     },
+    "node_modules/globalthis": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz",
+      "integrity": "sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "define-properties": "^1.2.1",
+        "gopd": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/globby": {
       "version": "14.0.2",
       "resolved": "https://registry.npmjs.org/globby/-/globby-14.0.2.tgz",
@@ -9257,6 +9959,17 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/has-bigints": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
+      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/has-flag": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
@@ -9303,6 +10016,23 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/has-tostringtag": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
+      "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "has-symbols": "^1.0.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/hasown": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
@@ -9723,6 +10453,22 @@
         "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
     },
+    "node_modules/internal-slot": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.7.tgz",
+      "integrity": "sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "hasown": "^2.0.0",
+        "side-channel": "^1.0.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/ip-address": {
       "version": "9.0.5",
       "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz",
@@ -9746,6 +10492,24 @@
         "node": ">= 0.10"
       }
     },
+    "node_modules/is-array-buffer": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz",
+      "integrity": "sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/is-arrayish": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
@@ -9753,27 +10517,107 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/is-binary-path": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
-      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+    "node_modules/is-bigint": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
+      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "has-bigints": "^1.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-binary-path": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "binary-extensions": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-boolean-object": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
+      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-callable": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
+      "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-core-module": {
+      "version": "2.15.1",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.1.tgz",
+      "integrity": "sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "hasown": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-data-view": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.1.tgz",
+      "integrity": "sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "binary-extensions": "^2.0.0"
+        "is-typed-array": "^1.1.13"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/is-core-module": {
-      "version": "2.15.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.0.tgz",
-      "integrity": "sha512-Dd+Lb2/zvk9SKy1TGCt1wFJFo/MWBPMX5x7KcvLajWTGuomczdQX61PvY5yK6SVACwpoexWo81IfFyoKY2QnTA==",
+    "node_modules/is-date-object": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
+      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "hasown": "^2.0.2"
+        "has-tostringtag": "^1.0.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -9870,6 +10714,20 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/is-negative-zero": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.3.tgz",
+      "integrity": "sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/is-network-error": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-network-error/-/is-network-error-1.1.0.tgz",
@@ -9893,6 +10751,23 @@
         "node": ">=0.12.0"
       }
     },
+    "node_modules/is-number-object": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
+      "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/is-path-inside": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
@@ -9929,6 +10804,41 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/is-regex": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
+      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-shared-array-buffer": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz",
+      "integrity": "sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "call-bind": "^1.0.7"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/is-stream": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
@@ -9942,6 +10852,57 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/is-string": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
+      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-symbol": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
+      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "has-symbols": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-typed-array": {
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.13.tgz",
+      "integrity": "sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "which-typed-array": "^1.1.14"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/is-unicode-supported": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
@@ -9955,6 +10916,20 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/is-weakref": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
+      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "call-bind": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/is-what": {
       "version": "3.14.1",
       "resolved": "https://registry.npmjs.org/is-what/-/is-what-3.14.1.tgz",
@@ -11262,10 +12237,13 @@
       }
     },
     "node_modules/merge-descriptors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-      "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==",
-      "license": "MIT"
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz",
+      "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==",
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
     },
     "node_modules/merge-stream": {
       "version": "2.0.0",
@@ -11294,9 +12272,9 @@
       }
     },
     "node_modules/micromatch": {
-      "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.7.tgz",
-      "integrity": "sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==",
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
+      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -12151,6 +13129,105 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/object-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/object.assign": {
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.5.tgz",
+      "integrity": "sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.5",
+        "define-properties": "^1.2.1",
+        "has-symbols": "^1.0.3",
+        "object-keys": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.entries": {
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.8.tgz",
+      "integrity": "sha512-cmopxi8VwRIAw/fkijJohSfpef5PdN0pMQJN6VC/ZKvn0LIknWD8KtgY6KlQdEc4tIjcQ3HxSMmnvtzIscdaYQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/object.fromentries": {
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.8.tgz",
+      "integrity": "sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.groupby": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.3.tgz",
+      "integrity": "sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/object.values": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.2.0.tgz",
+      "integrity": "sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/obuf": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
@@ -12686,9 +13763,9 @@
       "license": "ISC"
     },
     "node_modules/path-to-regexp": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-      "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==",
+      "version": "0.1.10",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz",
+      "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==",
       "license": "MIT"
     },
     "node_modules/path-type": {
@@ -12760,6 +13837,17 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/possible-typed-array-names": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz",
+      "integrity": "sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/postcss": {
       "version": "8.4.38",
       "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz",
@@ -12997,12 +14085,12 @@
       }
     },
     "node_modules/qs": {
-      "version": "6.11.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
-      "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz",
+      "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==",
       "license": "BSD-3-Clause",
       "dependencies": {
-        "side-channel": "^1.0.4"
+        "side-channel": "^1.0.6"
       },
       "engines": {
         "node": ">=0.6"
@@ -13158,6 +14246,26 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/regexp.prototype.flags": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.3.tgz",
+      "integrity": "sha512-vqlC04+RQoFalODCbCumG2xIOvapzVMHwsyIGM/SIE8fRhFFsXeH8/QQ+s0T0kDAhKc4k30s73/0ydkHQz6HlQ==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-errors": "^1.3.0",
+        "set-function-name": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/regexpu-core": {
       "version": "5.3.2",
       "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.3.2.tgz",
@@ -13439,6 +14547,34 @@
         "tslib": "^2.1.0"
       }
     },
+    "node_modules/safe-array-concat": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.2.tgz",
+      "integrity": "sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "get-intrinsic": "^1.2.4",
+        "has-symbols": "^1.0.3",
+        "isarray": "^2.0.5"
+      },
+      "engines": {
+        "node": ">=0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/safe-array-concat/node_modules/isarray": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true
+    },
     "node_modules/safe-buffer": {
       "version": "5.2.1",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
@@ -13459,6 +14595,25 @@
       ],
       "license": "MIT"
     },
+    "node_modules/safe-regex-test": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.3.tgz",
+      "integrity": "sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "call-bind": "^1.0.6",
+        "es-errors": "^1.3.0",
+        "is-regex": "^1.1.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/safer-buffer": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
@@ -13605,9 +14760,9 @@
       }
     },
     "node_modules/send": {
-      "version": "0.18.0",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
-      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
+      "version": "0.19.0",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz",
+      "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==",
       "license": "MIT",
       "dependencies": {
         "debug": "2.6.9",
@@ -13758,18 +14913,27 @@
       }
     },
     "node_modules/serve-static": {
-      "version": "1.15.0",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
-      "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
+      "version": "1.16.2",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz",
+      "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==",
       "license": "MIT",
       "dependencies": {
-        "encodeurl": "~1.0.2",
+        "encodeurl": "~2.0.0",
         "escape-html": "~1.0.3",
         "parseurl": "~1.3.3",
-        "send": "0.18.0"
+        "send": "0.19.0"
       },
       "engines": {
-        "node": ">= 0.8.0"
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/serve-static/node_modules/encodeurl": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
+      "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
       }
     },
     "node_modules/set-function-length": {
@@ -13789,6 +14953,23 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/set-function-name": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.2.tgz",
+      "integrity": "sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "define-data-property": "^1.1.4",
+        "es-errors": "^1.3.0",
+        "functions-have-names": "^1.2.3",
+        "has-property-descriptors": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/setprototypeof": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
@@ -13945,9 +15126,9 @@
       }
     },
     "node_modules/socket.io": {
-      "version": "4.7.5",
-      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.7.5.tgz",
-      "integrity": "sha512-DmeAkF6cwM9jSfmp6Dr/5/mfMwb5Z5qRrSXLpo3Fq5SqyU8CMF15jIN4ZhfSwu35ksM1qmHZDQ/DK5XTccSTvA==",
+      "version": "4.8.0",
+      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.8.0.tgz",
+      "integrity": "sha512-8U6BEgGjQOfGz3HHTYaC/L1GaxDCJ/KM0XTkJly0EhZ5U/du9uNEZy4ZgYzEzIqlx2CMm25CrCqr1ck899eLNA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -13955,7 +15136,7 @@
         "base64id": "~2.0.0",
         "cors": "~2.8.5",
         "debug": "~4.3.2",
-        "engine.io": "~6.5.2",
+        "engine.io": "~6.6.0",
         "socket.io-adapter": "~2.5.2",
         "socket.io-parser": "~4.2.4"
       },
@@ -14320,6 +15501,61 @@
         "url": "https://github.com/chalk/strip-ansi?sponsor=1"
       }
     },
+    "node_modules/string.prototype.trim": {
+      "version": "1.2.9",
+      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.9.tgz",
+      "integrity": "sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.0",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.trimend": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.8.tgz",
+      "integrity": "sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.trimstart": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz",
+      "integrity": "sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/strip-ansi": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
@@ -14347,6 +15583,17 @@
         "node": ">=8"
       }
     },
+    "node_modules/strip-bom": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+      "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/strip-final-newline": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
@@ -14709,6 +15956,34 @@
         "typescript": ">=4.2.0"
       }
     },
+    "node_modules/tsconfig-paths": {
+      "version": "3.15.0",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz",
+      "integrity": "sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@types/json5": "^0.0.29",
+        "json5": "^1.0.2",
+        "minimist": "^1.2.6",
+        "strip-bom": "^3.0.0"
+      }
+    },
+    "node_modules/tsconfig-paths/node_modules/json5": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+      "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "minimist": "^1.2.0"
+      },
+      "bin": {
+        "json5": "lib/cli.js"
+      }
+    },
     "node_modules/tslib": {
       "version": "2.6.3",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz",
@@ -14769,6 +16044,87 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/typed-array-buffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.2.tgz",
+      "integrity": "sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "es-errors": "^1.3.0",
+        "is-typed-array": "^1.1.13"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/typed-array-byte-length": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.1.tgz",
+      "integrity": "sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "for-each": "^0.3.3",
+        "gopd": "^1.0.1",
+        "has-proto": "^1.0.3",
+        "is-typed-array": "^1.1.13"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/typed-array-byte-offset": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.2.tgz",
+      "integrity": "sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "available-typed-arrays": "^1.0.7",
+        "call-bind": "^1.0.7",
+        "for-each": "^0.3.3",
+        "gopd": "^1.0.1",
+        "has-proto": "^1.0.3",
+        "is-typed-array": "^1.1.13"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/typed-array-length": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.6.tgz",
+      "integrity": "sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "for-each": "^0.3.3",
+        "gopd": "^1.0.1",
+        "has-proto": "^1.0.3",
+        "is-typed-array": "^1.1.13",
+        "possible-typed-array-names": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/typed-assert": {
       "version": "1.0.9",
       "resolved": "https://registry.npmjs.org/typed-assert/-/typed-assert-1.0.9.tgz",
@@ -14814,6 +16170,69 @@
         }
       }
     },
+    "node_modules/typescript-eslint/node_modules/@typescript-eslint/eslint-plugin": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.1.0.tgz",
+      "integrity": "sha512-LlNBaHFCEBPHyD4pZXb35mzjGkuGKXU5eeCA1SxvHfiRES0E82dOounfVpL4DCqYvJEKab0bZIA0gCRpdLKkCw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@eslint-community/regexpp": "^4.10.0",
+        "@typescript-eslint/scope-manager": "8.1.0",
+        "@typescript-eslint/type-utils": "8.1.0",
+        "@typescript-eslint/utils": "8.1.0",
+        "@typescript-eslint/visitor-keys": "8.1.0",
+        "graphemer": "^1.4.0",
+        "ignore": "^5.3.1",
+        "natural-compare": "^1.4.0",
+        "ts-api-utils": "^1.3.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "@typescript-eslint/parser": "^8.0.0 || ^8.0.0-alpha.0",
+        "eslint": "^8.57.0 || ^9.0.0"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/typescript-eslint/node_modules/@typescript-eslint/parser": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.1.0.tgz",
+      "integrity": "sha512-U7iTAtGgJk6DPX9wIWPPOlt1gO57097G06gIcl0N0EEnNw8RGD62c+2/DiP/zL7KrkqnnqF7gtFGR7YgzPllTA==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "@typescript-eslint/scope-manager": "8.1.0",
+        "@typescript-eslint/types": "8.1.0",
+        "@typescript-eslint/typescript-estree": "8.1.0",
+        "@typescript-eslint/visitor-keys": "8.1.0",
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^8.57.0 || ^9.0.0"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/typescript-eslint/node_modules/@typescript-eslint/scope-manager": {
       "version": "8.1.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.1.0.tgz",
@@ -14832,6 +16251,31 @@
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
+    "node_modules/typescript-eslint/node_modules/@typescript-eslint/type-utils": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.1.0.tgz",
+      "integrity": "sha512-oLYvTxljVvsMnldfl6jIKxTaU7ok7km0KDrwOt1RHYu6nxlhN3TIx8k5Q52L6wR33nOwDgM7VwW1fT1qMNfFIA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/typescript-estree": "8.1.0",
+        "@typescript-eslint/utils": "8.1.0",
+        "debug": "^4.3.4",
+        "ts-api-utils": "^1.3.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/typescript-eslint/node_modules/@typescript-eslint/types": {
       "version": "8.1.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.1.0.tgz",
@@ -14997,6 +16441,23 @@
         "node": "*"
       }
     },
+    "node_modules/unbox-primitive": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
+      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "has-bigints": "^1.0.2",
+        "has-symbols": "^1.0.3",
+        "which-boxed-primitive": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/undici": {
       "version": "6.19.2",
       "resolved": "https://registry.npmjs.org/undici/-/undici-6.19.2.tgz",
@@ -15711,6 +17172,45 @@
         "which": "bin/which"
       }
     },
+    "node_modules/which-boxed-primitive": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
+      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "is-bigint": "^1.0.1",
+        "is-boolean-object": "^1.1.0",
+        "is-number-object": "^1.0.4",
+        "is-string": "^1.0.5",
+        "is-symbol": "^1.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/which-typed-array": {
+      "version": "1.1.15",
+      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.15.tgz",
+      "integrity": "sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "available-typed-arrays": "^1.0.7",
+        "call-bind": "^1.0.7",
+        "for-each": "^0.3.3",
+        "gopd": "^1.0.1",
+        "has-tostringtag": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/wildcard": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.1.tgz",
diff --git a/client/package.json b/client/package.json
index 34783c9..113bc37 100644
--- a/client/package.json
+++ b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "client",
-  "version": "0.2.1",
+  "version": "0.3.0",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",
@@ -9,7 +9,8 @@
     "watch": "ng build --watch",
     "test": "ng test",
     "serve:ssr:client": "node dist/client/server/server.mjs",
-    "lint": "ng lint"
+    "lint": "ng lint",
+    "lint:fix": "ng lint. --fix"
   },
   "private": true,
   "dependencies": {
@@ -25,9 +26,11 @@
     "@angular/platform-server": "^18.1.0",
     "@angular/router": "^18.1.0",
     "@angular/ssr": "^18.1.2",
+    "@eslint/js": "^9.13.0",
     "@fortawesome/angular-fontawesome": "^0.15.0",
     "@fortawesome/fontawesome-svg-core": "^6.6.0",
     "@fortawesome/free-solid-svg-icons": "^6.6.0",
+    "eslint": "^9.13.0",
     "express": "^4.18.2",
     "ngx-file-drop": "^16.0.0",
     "rxjs": "~7.8.0",
@@ -37,13 +40,24 @@
   },
   "devDependencies": {
     "@angular-devkit/build-angular": "^18.1.2",
+    "@angular-eslint/builder": "18.3.0",
+    "@angular-eslint/eslint-plugin": "18.3.0",
+    "@angular-eslint/eslint-plugin-template": "18.3.0",
+    "@angular-eslint/schematics": "18.3.0",
+    "@angular-eslint/template-parser": "18.3.0",
     "@angular/cli": "^18.1.2",
     "@angular/compiler-cli": "^18.1.0",
     "@types/express": "^4.17.17",
     "@types/jasmine": "~5.1.0",
     "@types/node": "^22.1.0",
+    "@typescript-eslint/eslint-plugin": "7.11.0",
+    "@typescript-eslint/parser": "7.11.0",
     "angular-eslint": "18.3.0",
-    "eslint": "^9.9.0",
+    "eslint": "8.57.0",
+    "eslint-config-airbnb-base": "^15.0.0",
+    "eslint-config-airbnb-typescript": "^18.0.0",
+    "eslint-plugin-simple-import-sort": "^12.1.1",
+    "eslint-plugin-unused-imports": "^4.1.4",
     "jasmine-core": "~5.2.0",
     "karma": "~6.4.0",
     "karma-chrome-launcher": "~3.2.0",
@@ -53,4 +67,4 @@
     "typescript": "~5.5.4",
     "typescript-eslint": "8.1.0"
   }
-}
\ No newline at end of file
+}
diff --git a/server/Cargo.toml b/server/Cargo.toml
index 4419900..e13880f 100644
--- a/server/Cargo.toml
+++ b/server/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "server"
-version = "0.2.0"
+version = "0.3.0"
 edition = "2021"
 
 [[bin]]
@@ -29,4 +29,4 @@ bytes = "1"
 [dev-dependencies]
 actix-rt = "2.2"
 actix-test = "0.1"
-futures-util = { version = "0.3.17", default-features = false, features = ["std"] }
\ No newline at end of file
+futures-util = { version = "0.3.17", default-features = false, features = ["std"] }