From c208d45b920eda69efd4279d1df2048cb47f029b Mon Sep 17 00:00:00 2001
From: Benny Daon <benny@tuzig.com>
Date: Sun, 15 Oct 2023 16:01:50 +0300
Subject: [PATCH 01/53] Adding the book icon to the legend

---
 index.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/index.html b/index.html
index 12189920..f30ebbb2 100644
--- a/index.html
+++ b/index.html
@@ -59,8 +59,9 @@ <h1 id="title-short">T7</h1>
 			  </div>
               <ul>
                   <li>
+                      &#x1F4D6; &nbsp;
                       <a id="peerbook-legend">
-                      PeerBook
+                       PeerBook
                       <span id="peerbook-status" class="status">🚧</span>
                       </a>
                     </li>

From 245e400352d6d828975c420aa30643ad8f522fd0 Mon Sep 17 00:00:00 2001
From: Benny Daon <benny@tuzig.com>
Date: Sun, 22 Oct 2023 07:55:03 +0300
Subject: [PATCH 02/53] Refactoring the admin command

---
 src/commands.ts | 16 ++++++++++++++--
 src/peerbook.ts | 38 ++++++++++++++++++++------------------
 2 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/src/commands.ts b/src/commands.ts
index c70ba586..5374685b 100644
--- a/src/commands.ts
+++ b/src/commands.ts
@@ -499,7 +499,13 @@ async function editCMD(shell:Shell, args: string[]) {
             fFields = fFields.filter((_, i) => enabled[i])
             res = await shell.runForm(fFields, "text")
             if (isPB && enabled[0]) {
-                const code = await terminal7.pb.adminCommand("rename", gate.fp, res[0])
+                const code = await terminal7.pb.adminCommand({
+                    type: "rename",
+                    args: {
+                       target: gate.fp,
+                       otp: res[0]
+                    }
+                })
                 if (code != "1") {
                     shell.t.writeln("Failed to rename host")
                     res[0] = gate.name
@@ -518,7 +524,13 @@ async function editCMD(shell:Shell, args: string[]) {
             if (isPB) {
                 const otp = await shell.askValue("OTP")
                 try {
-                    await terminal7.pb.adminCommand("delete", gate.fp, otp)
+                    await terminal7.pb.adminCommand({
+                        type: "delete",
+                        args: {
+                            target: gate.fp,
+                            otp: otp
+                        }
+                    })
                 } catch (e) {
                     console.log("Failed to delete host", e)
                     shell.t.writeln("Failed to delete host")
diff --git a/src/peerbook.ts b/src/peerbook.ts
index b92f8306..3ee2bc52 100644
--- a/src/peerbook.ts
+++ b/src/peerbook.ts
@@ -62,8 +62,9 @@ export class PeerbookConnection {
         this.uid = ""
     }
 
-    async adminCommand(cmd: string, ...args: string[]): Promise<string> {
-        const c = args?[cmd, ...args]:[cmd]
+    async adminCommand(cmd: unknown): Promise<string> {
+        const m = JSON.stringify(cmd)
+
         if (!this.session) {
             console.log("Admin command with no session")
             try {
@@ -73,19 +74,8 @@ export class PeerbookConnection {
                 throw new Error("Failed to connect")
             }
         }   
-
         return new Promise((resolve, reject) => {
-            const reply = []
-            this.session.openChannel(c, 0, 80, 24).then(channel  => {
-                channel.onClose = () => {
-                    const ret =  new TextDecoder().decode(new Uint8Array(reply))
-                    terminal7.log(`cmd ${cmd} ${args} closed with: ${ret}`)
-                    resolve(ret)
-                }
-                channel.onMessage = (data: Uint8Array) => {
-                    reply.push(...data)
-                }
-            }).catch(reject)
+            this.session.sendCTRLMsg(m, resolve, reject)
         })
     }
 
@@ -107,7 +97,13 @@ export class PeerbookConnection {
             return
         }
         try {
-            repStr = await this.adminCommand("register", email, peerName)
+            repStr = await this.adminCommand({
+                type: "register",
+                args: {
+                     email: email,
+                     peer_name: peerName
+                }
+            })
         } catch (e) {
             this.shell.t.writeln(`${PB} Registration failed\n    Please try again and if persists, \`support\``)
             this.shell.printPrompt()
@@ -236,10 +232,10 @@ export class PeerbookConnection {
                 reject("No session")
                 return
             }
-            this.adminCommand("ping").then((uid: string) => {
+            this.session.sendCTRLMsg({type: "ping"}, (uid: string) => {
                 this.uid = uid
                 resolve(uid)
-            }).catch(reject)
+            }, reject)
         })
     }
             
@@ -436,7 +432,13 @@ export class PeerbookConnection {
             }
             let data
             try {
-                data = await this.adminCommand("verify", fp, otp)
+                data = await this.adminCommand({
+                    type: "verify",
+                    args: {
+                        target: fp, 
+                        otp: otp
+                    }
+                })
             } catch(e) {
                 console.log("verifyFP: failed to verify", e.toString())
                 this.echo("Failed to verify, please try again")

From 57eaa30d370710b4cc2529a286ea1bc74d708744 Mon Sep 17 00:00:00 2001
From: Benny Daon <benny@tuzig.com>
Date: Sun, 22 Oct 2023 18:38:45 +0300
Subject: [PATCH 03/53] Updating the nack schema

---
 src/webrtc_session.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/webrtc_session.ts b/src/webrtc_session.ts
index 50b3703a..455d7576 100644
--- a/src/webrtc_session.ts
+++ b/src/webrtc_session.ts
@@ -266,7 +266,7 @@ export class WebRTCSession extends BaseSession {
                     this.t7.log("got cdc message:",  msg)
                     if (msg.type == "nack") {
                         if (handlers && (typeof handlers[1] == "function"))
-                            handlers[1](msg.desc)
+                            handlers[1](msg.args.desc)
                         else
                             console.log("A nack is unhandled", msg)
                     } else {

From 57157b33d2809b8bb57c2c8bb4d54e52e18d645c Mon Sep 17 00:00:00 2001
From: Benny Daon <benny@tuzig.com>
Date: Mon, 23 Oct 2023 15:40:25 +0300
Subject: [PATCH 04/53] Fixixng small bugs

---
 src/commands.ts  |  2 +-
 src/peerbook.ts  | 20 +++++++++-----------
 src/terminal7.ts |  5 ++++-
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/commands.ts b/src/commands.ts
index 5374685b..fd1dc7ae 100644
--- a/src/commands.ts
+++ b/src/commands.ts
@@ -503,7 +503,7 @@ async function editCMD(shell:Shell, args: string[]) {
                     type: "rename",
                     args: {
                        target: gate.fp,
-                       otp: res[0]
+                       name: res[0]
                     }
                 })
                 if (code != "1") {
diff --git a/src/peerbook.ts b/src/peerbook.ts
index 3ee2bc52..80376592 100644
--- a/src/peerbook.ts
+++ b/src/peerbook.ts
@@ -62,9 +62,7 @@ export class PeerbookConnection {
         this.uid = ""
     }
 
-    async adminCommand(cmd: unknown): Promise<string> {
-        const m = JSON.stringify(cmd)
-
+    async adminCommand(msg: unknown): Promise<string> {
         if (!this.session) {
             console.log("Admin command with no session")
             try {
@@ -75,7 +73,7 @@ export class PeerbookConnection {
             }
         }   
         return new Promise((resolve, reject) => {
-            this.session.sendCTRLMsg(m, resolve, reject)
+            this.session.sendCTRLMsg(msg, resolve, reject)
         })
     }
 
@@ -439,15 +437,15 @@ export class PeerbookConnection {
                         otp: otp
                     }
                 })
+                validated = true
             } catch(e) {
-                console.log("verifyFP: failed to verify", e.toString())
-                this.echo("Failed to verify, please try again")
-                continue
+                if (e.toString().match(/invalid/i)) 
+                    this.echo("Invalid OTP, please try again")
+                else {
+                    console.log("verifyFP: failed to verify", e.toString())
+                    this.echo("Failed to verify, please try again")
+                } 
             }
-            console.log("Got verify reply", data[0])
-            validated = data[0] == "1"
-            if (!validated)
-                this.echo("Invalid OTP, please try again")
         }
     }
     purchase(aPackage): Promise<void> {
diff --git a/src/terminal7.ts b/src/terminal7.ts
index 1cef7e38..6797465b 100644
--- a/src/terminal7.ts
+++ b/src/terminal7.ts
@@ -863,7 +863,10 @@ export class Terminal7 {
         if (m["peer_update"] !== undefined) {
             g.online = m.peer_update.online
             g.verified = m.peer_update.verified
-            g.fp = m.source_fp
+            if (g.name != m.peer_update.name) {
+                g.name = m.peer_update.name
+                this.storeGates()
+            }
             await g.updateNameE()
             return
         }

From f843ebfb133ebda02e9c32e2c8cf047c79bf29a9 Mon Sep 17 00:00:00 2001
From: Benny Daon <benny@tuzig.com>
Date: Mon, 23 Oct 2023 18:15:56 +0300
Subject: [PATCH 05/53] Updating gatepad on succesful verification

---
 src/peerbook.ts  | 91 +++++++-----------------------------------------
 src/terminal7.ts |  2 +-
 2 files changed, 13 insertions(+), 80 deletions(-)

diff --git a/src/peerbook.ts b/src/peerbook.ts
index 80376592..bfd4d529 100644
--- a/src/peerbook.ts
+++ b/src/peerbook.ts
@@ -148,12 +148,6 @@ export class PeerbookConnection {
         }
         await Purchases.logIn({ appUserID: uid })
         this.shell.t.writeln("Validated! Use `install` to install on a server")
-        try {
-            await this.wsConnect()
-        } catch (e) {
-            this.shell.t.writeln("Failed to connect to PeerBook")
-            console.log("Failed to connect to PeerBook", e)
-        }
         this.shell.printPrompt()
     }
     async startPurchases() {
@@ -264,7 +258,7 @@ export class PeerbookConnection {
                             reject("Unregistered")
                         } else {
                             Purchases.logIn({ appUserID: uid })
-                            this.wsConnect().then(resolve).catch(reject)
+                            resolve()
                         }
                     }).catch(e => {
                         this.session = null
@@ -275,6 +269,8 @@ export class PeerbookConnection {
                 }
                 else if (state == 'failed') {
                     this.stopSpinner()
+                    // TODO: retry connection
+                    // symbol = ERROR_HTML_SYMBOL
                     this.session = null
                     console.log("PB webrtc connection failed", failure)
                     if (this.uid == "TBD")
@@ -287,77 +283,6 @@ export class PeerbookConnection {
             session.connect()
         })
     }
-    async wsConnect() {
-        console.log("peerbook wsConnect called")
-        let firstMessage = true
-        return new Promise<void>((resolve, reject) => {
-            if (this.ws != null) {
-                if (this.isOpen()) {
-                    resolve()
-                    return
-                }
-                this.ws.onopen = undefined
-                this.ws.onmessage = undefined
-                this.ws.onerror = undefined
-                this.ws.onclose = undefined
-                try {
-                    this.ws.close()
-                } catch (e) {
-                    terminal7.log("ws close failed", e)
-                }
-            }
-            const schema = this.insecure?"ws":"wss",
-                  url = encodeURI(`${schema}://${this.host}/ws?fp=${this.fp}`),
-                  statusE = document.getElementById("peerbook-status"),
-                  ws = new WebSocket(url)
-            this.ws = ws
-            ws.onmessage = ev => {
-                const m = JSON.parse(ev.data)
-                if (m.code >= 400) {
-                    console.log("peerbook connect got code", m.code)
-                    this.stopSpinner()
-                    statusE.innerHTML = ERROR_HTML_SYMBOL
-                    // reject(`PeerBook connection error ${m.code}`)
-                    return
-                } 
-                if (firstMessage) {
-                    this.stopSpinner()
-                    firstMessage = false
-                    resolve()
-                }
-                if (this.onUpdate)
-                    this.onUpdate(m)
-                else
-                    terminal7.log("got ws message but no onUpdate", m)
-            }
-            ws.onerror = ev =>  {
-                terminal7.log("peerbook ws error", ev.toString())
-                this.ws = null
-                this.stopSpinner()
-                statusE.innerHTML = ERROR_HTML_SYMBOL
-                reject()
-            }
-            ws.onclose = (ev) => {
-                terminal7.log("peerbook ws closed", ev)
-                this.ws = null
-                this.stopSpinner()
-                if (statusE.innerHTML != ERROR_HTML_SYMBOL)
-                    statusE.innerHTML = CLOSED_HTML_SYMBOL
-            }
-            ws.onopen = () => {
-                console.log("peerbook ws open")
-                if ((this.pbSendTask == null) && (this.pending.length > 0))
-                    this.pbSendTask = setTimeout(() => {
-                        this.pending.forEach(m => {
-                            console.log("sending ", m)
-                            ws.send(JSON.stringify(m))
-                        })
-                        this.pbSendTask = null
-                        this.pending = []
-                    }, 10)
-            }
-        })
-    }
     send(m) {
         // null message are used to trigger connection, ignore them
         const state = this.ws ? this.ws.readyState : WebSocket.CLOSED
@@ -430,7 +355,7 @@ export class PeerbookConnection {
             }
             let data
             try {
-                data = await this.adminCommand({
+                await this.adminCommand({
                     type: "verify",
                     args: {
                         target: fp, 
@@ -446,6 +371,14 @@ export class PeerbookConnection {
                     this.echo("Failed to verify, please try again")
                 } 
             }
+        } 
+        const gate = terminal7.gates.find(g => g.fp === fp) 
+        if (gate) {
+            gate.verified = true
+            gate.updateNameE()
+        } else {
+            terminal7.log("Failed to update gate status as it wasn't found")
+            terminal7.gates.forEach((g,i: number) => terminal7.log(`gate ${i}:`, g.fp))
         }
     }
     purchase(aPackage): Promise<void> {
diff --git a/src/terminal7.ts b/src/terminal7.ts
index 6797465b..c07402c3 100644
--- a/src/terminal7.ts
+++ b/src/terminal7.ts
@@ -458,7 +458,7 @@ export class Terminal7 {
             if (this.pb) {
                 this.pb.startSpinner()
                 if ((this.pb.uid != "TBD")  && (this.pb.uid != "")) {
-                    this.pb.wsConnect().then(callResolve).catch(callReject)
+                    callResolve()
                     return
                 }
                 if (this.pb.isOpen())

From 3553a00cd55993d23ca5eea09ed63940f7e8ffb8 Mon Sep 17 00:00:00 2001
From: Benny Daon <benny@tuzig.com>
Date: Tue, 24 Oct 2023 17:19:50 +0300
Subject: [PATCH 06/53] Updating rename on peer_update

---
 src/commands.ts | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/commands.ts b/src/commands.ts
index fd1dc7ae..24ee0875 100644
--- a/src/commands.ts
+++ b/src/commands.ts
@@ -499,23 +499,17 @@ async function editCMD(shell:Shell, args: string[]) {
             fFields = fFields.filter((_, i) => enabled[i])
             res = await shell.runForm(fFields, "text")
             if (isPB && enabled[0]) {
-                const code = await terminal7.pb.adminCommand({
+                await terminal7.pb.adminCommand({
                     type: "rename",
                     args: {
                        target: gate.fp,
                        name: res[0]
                     }
                 })
-                if (code != "1") {
-                    shell.t.writeln("Failed to rename host")
-                    res[0] = gate.name
-                }
             }
             gateAttrs.filter((_, i) => enabled[i])
                      .forEach((k, i) => 
                         gate[k] = (k == 'onlySSH')?res[i] == 'y':res[i])
-            gate.t7.storeGates()
-            gate.updateNameE()
             break
         case "\x1B[31mDelete\x1B[0m":
             res = await shell.runForm(fDel, "text")

From c7ad16b3314dc247eb722f5d5511052f3bdb5679 Mon Sep 17 00:00:00 2001
From: Benny Daon <benny@tuzig.com>
Date: Tue, 24 Oct 2023 17:51:23 +0300
Subject: [PATCH 07/53] Cleaning up

---
 src/peerbook.ts  | 17 ++++++-----------
 src/terminal7.ts |  1 -
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/peerbook.ts b/src/peerbook.ts
index bfd4d529..bcce57a6 100644
--- a/src/peerbook.ts
+++ b/src/peerbook.ts
@@ -280,19 +280,13 @@ export class PeerbookConnection {
                     return
                 }
             }
+            session.onCMD = (msg) => {
+                console.log("got CMD withtypeof", typeof msg)
+                terminal7.onPBMessage(msg)
+            }
             session.connect()
         })
     }
-    send(m) {
-        // null message are used to trigger connection, ignore them
-        const state = this.ws ? this.ws.readyState : WebSocket.CLOSED
-        if (state == WebSocket.OPEN) {
-            this.ws.send(JSON.stringify(m))
-        } else {
-            terminal7.log("peerbook send called with state", state)
-            this.pending.push(m)
-        }
-    }
     close() {
         if (this.ws) {
             this.ws.onopen = undefined
@@ -309,7 +303,8 @@ export class PeerbookConnection {
         }
     }
     isOpen() {
-        return (this.ws ? this.ws.readyState === WebSocket.OPEN : false)
+        // TODO: improve this
+        return (this.session != null)
     }
     syncPeers(gates: Array<Gate>, nPeers: Array<Peer>) {
         const ret = []
diff --git a/src/terminal7.ts b/src/terminal7.ts
index c07402c3..6be48cef 100644
--- a/src/terminal7.ts
+++ b/src/terminal7.ts
@@ -475,7 +475,6 @@ export class Terminal7 {
                     shell: this.map.shell
                 })
                 this.pb.startSpinner()
-                this.pb.onUpdate = (m) => this.onPBMessage(m)
                 if (!this.purchasesStarted) {
                     this.pb.startPurchases().then(() => 
                         this.pb.connect().then(callResolve).catch(catchConnect)

From d5ce6b435a264c1d2b9ee685a5cfbcc910adf7e7 Mon Sep 17 00:00:00 2001
From: Benny Daon <benny@tuzig.com>
Date: Wed, 25 Oct 2023 11:43:35 +0300
Subject: [PATCH 08/53] Fixing login

---
 aatp/peerbook_webrtc/admin.spec.ts |  2 +-
 src/commands.ts                    | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/aatp/peerbook_webrtc/admin.spec.ts b/aatp/peerbook_webrtc/admin.spec.ts
index 8ab4f1ee..4dfd8330 100644
--- a/aatp/peerbook_webrtc/admin.spec.ts
+++ b/aatp/peerbook_webrtc/admin.spec.ts
@@ -346,7 +346,7 @@ test.describe('peerbook administration', ()  => {
         expect(url).toMatch(/^http:\/\/peerbook:17777\/verify/)
         await sleep(500)
         const fp = await page.evaluate(() => terminal7.getFingerprint())
-        console.log("fp", fp)
+        console.log("new client's fp", fp)
         expect(await redisClient.hGet(`peer:${fp}`, "user")).toBe("123456")
         const verifyPage = await (await browser.newContext()).newPage()
         await verifyPage.goto(url)
diff --git a/src/commands.ts b/src/commands.ts
index 24ee0875..ed72510f 100644
--- a/src/commands.ts
+++ b/src/commands.ts
@@ -977,13 +977,14 @@ async function loginCMD(shell: Shell) {
         return
     }
     shell.t.writeln(`PeerBook response: ${await res.text()}`)
-    try {
-        terminal7.pb.wsConnect()
-    } catch(e) {}
     let timedOut = false
     shell.startWatchdog(180000).catch(() => timedOut = true)
-    while (!terminal7.pb.uid && !timedOut)
-        await new Promise(r => setTimeout(r, 200))
+    while (!terminal7.pb.uid && !timedOut) {
+        await new Promise(r => setTimeout(r, 2000))
+        try {
+            await terminal7.pb.connect()
+        } catch(e) {}
+    }
     if (timedOut) {
         shell.t.writeln("Login timed out, please try again")
         return

From 13726a4749fa7f38ed0f4cb22bc646ef6b884f3c Mon Sep 17 00:00:00 2001
From: Benny Daon <benny@tuzig.com>
Date: Wed, 25 Oct 2023 11:44:17 +0300
Subject: [PATCH 09/53] Fixing the offer and candidate signals

---
 src/webrtc_session.ts | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/webrtc_session.ts b/src/webrtc_session.ts
index 455d7576..a8e032a6 100644
--- a/src/webrtc_session.ts
+++ b/src/webrtc_session.ts
@@ -413,7 +413,11 @@ export class PeerbookSession extends WebRTCSession {
     }
     onIceCandidate(ev: RTCPeerConnectionIceEvent) {
         if (ev.candidate && this.t7.pb) {
-            this.t7.pb.send({target: this.fp, candidate: ev.candidate})
+            this.t7.pb.adminCommand({type: "candidate",
+                                     args: {
+                                         target: this.fp,
+                                         sdp: ev.candidate
+                                    }})
         } else {
             terminal7.log("ignoring ice candidate", JSON.stringify(ev.candidate))
         }
@@ -427,7 +431,11 @@ export class PeerbookSession extends WebRTCSession {
             if (!terminal7.pb)
                 console.log("no peerbook")
             else
-                terminal7.pb.send({target: this.fp, offer: offer})
+                terminal7.pb.adminCommand({type: "offer",
+                                          args: {
+                                              target: this.fp,
+                                              sdp: offer
+                                          }})
         })
     }
     peerAnswer(offer) {

From 959ff2f36424f53f15e2ac0b8252cc3f80d77926 Mon Sep 17 00:00:00 2001
From: Benny Daon <benny@tuzig.com>
Date: Wed, 25 Oct 2023 15:16:53 +0300
Subject: [PATCH 10/53] Unparsing what needs to be parsed

---
 src/gate.ts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/gate.ts b/src/gate.ts
index 4bc05ffa..51285af1 100644
--- a/src/gate.ts
+++ b/src/gate.ts
@@ -732,9 +732,13 @@ export class Gate {
     }
     load() {
         this.t7.log("loading gate")
-        this.session.getPayload().then(layout => {
+        this.session.getPayload().then((payload: string) => {
+            let layout: ServerPayload | null = null
+            try {
+                layout = JSON.parse(payload)
+            } catch(e) {}
             console.log("got payload", layout)
-            this.setLayout(layout as ServerPayload)
+            this.setLayout(layout)
         })
         document.getElementById("map").classList.add("hidden")
     }

From b38ac409ef71f0156a1e64ddbca56b883dabc886 Mon Sep 17 00:00:00 2001
From: Benny Daon <benny@tuzig.com>
Date: Wed, 25 Oct 2023 16:10:38 +0300
Subject: [PATCH 11/53] Fixing redis and sleeping longer

---
 aatp/infra/redis/Dockerfile        | 3 +++
 aatp/peerbook_webrtc/admin.spec.ts | 4 +++-
 aatp/peerbook_webrtc/lab.yaml      | 4 +++-
 3 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 aatp/infra/redis/Dockerfile

diff --git a/aatp/infra/redis/Dockerfile b/aatp/infra/redis/Dockerfile
new file mode 100644
index 00000000..68908147
--- /dev/null
+++ b/aatp/infra/redis/Dockerfile
@@ -0,0 +1,3 @@
+FROM redis:alpine
+RUN echo "appendonly no" >> /etc/redis.conf
+CMD [ "redis-server", "/etc/redis.conf" ]
diff --git a/aatp/peerbook_webrtc/admin.spec.ts b/aatp/peerbook_webrtc/admin.spec.ts
index 4dfd8330..363f0092 100644
--- a/aatp/peerbook_webrtc/admin.spec.ts
+++ b/aatp/peerbook_webrtc/admin.spec.ts
@@ -352,7 +352,9 @@ test.describe('peerbook administration', ()  => {
         await verifyPage.goto(url)
         await verifyPage.screenshot({ path: '/result/6.png' })
         await verifyPage.click('button[type="submit"]')
-        await sleep(500)
+        // TODO: optimize this sleep. 5 second is the max time it takes for the
+        // client to be logged in. We should have a retry loop instead.
+        await sleep(5000)
         const twr = await getTWRBuffer(page)
         await page.screenshot({ path: '/result/5.png' })
         expect(twr).toMatch(/Logged in/)
diff --git a/aatp/peerbook_webrtc/lab.yaml b/aatp/peerbook_webrtc/lab.yaml
index 48e7de51..5569d94f 100644
--- a/aatp/peerbook_webrtc/lab.yaml
+++ b/aatp/peerbook_webrtc/lab.yaml
@@ -53,7 +53,9 @@ services:
       PB_SMTP_PORT: 1025
       PB_HOME_URL: http://peerbook:17777
   redis:
-    image: "redis:alpine"
+    build:
+      context: .
+      dockerfile: ./aatp/infra/redis/Dockerfile
   revenuecat:
     image: "mockserver/mockserver"
     environment:

From eee605387564646bde6fb3abad1d2257209e80c1 Mon Sep 17 00:00:00 2001
From: Benny Daon <benny@tuzig.com>
Date: Wed, 25 Oct 2023 17:59:55 +0300
Subject: [PATCH 12/53] Fixing reconnect

---
 aatp/peerbook_webrtc/admin.spec.ts |  4 +++-
 src/gate.ts                        | 16 ++++++++--------
 src/webrtc_session.ts              |  6 ++++--
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/aatp/peerbook_webrtc/admin.spec.ts b/aatp/peerbook_webrtc/admin.spec.ts
index 363f0092..0c7ec8de 100644
--- a/aatp/peerbook_webrtc/admin.spec.ts
+++ b/aatp/peerbook_webrtc/admin.spec.ts
@@ -328,7 +328,9 @@ test.describe('peerbook administration', ()  => {
         await page.keyboard.press("Enter")
         await page.keyboard.type('testclient')
         await page.keyboard.press("Enter")
-        await sleep(1000)
+        // TODO: optimize this sleep. 5 second is the max time it takes for the
+        // client to be logged in. We should have a retry loop instead.
+        await sleep(5000)
         const fp = await page.evaluate(() => terminal7.getFingerprint())
         expect(await redisClient.hGet(`peer:${fp}`, "user")).toBe(uid)
         twr = await getTWRBuffer(page)
diff --git a/src/gate.ts b/src/gate.ts
index 51285af1..ffe90923 100644
--- a/src/gate.ts
+++ b/src/gate.ts
@@ -309,11 +309,13 @@ export class Gate {
         const isSSH = this.session.isSSH
         const isNative = Capacitor.isNativePlatform()
         return new Promise((resolve, reject) => {
+            const handleLauout = (layout) => {
+                this.setLayout(JSON.parse(layout as string) as ServerPayload)
+                resolve()
+            }
             if (!isSSH && !isNative) {
-                this.session.reconnect(this.marker).then(layout => {
-                    this.setLayout(layout as ServerPayload)
-                    resolve()
-                }).catch(() => {
+                this.session.reconnect(this.marker).then(layout => handleLauout(layout))
+                .catch(() => {
                     if (this.session) {
                         this.session.close()
                         this.session = null
@@ -331,10 +333,8 @@ export class Gate {
                 this.map.shell.onDisconnect(this, isSSH).then(resolve).catch(reject)
             }
             this.t7.readId().then(({publicKey, privateKey}) => {
-                this.session.reconnect(this.marker, publicKey, privateKey).then(layout => {
-                    this.setLayout(layout as ServerPayload)
-                    resolve()
-                }).catch(e => {
+                this.session.reconnect(this.marker).then(layout => handleLauout(layout))
+                .catch(e => {
                     closeSessionAndDisconnect()
                     this.t7.log("reconnect failed, calling the shell to handle it", isSSH, e)
                 })
diff --git a/src/webrtc_session.ts b/src/webrtc_session.ts
index a8e032a6..3499591e 100644
--- a/src/webrtc_session.ts
+++ b/src/webrtc_session.ts
@@ -337,9 +337,11 @@ export class WebRTCSession extends BaseSession {
                     type: "mark",
                     args: null
                 }, (payload) => {
-                this.t7.log("got a marker", payload)
+                const marker = parseInt(payload)
+
+                this.t7.log("got a marker", marker)
                 this.closeChannels()
-                resolve(payload)
+                resolve(marker)
             }, reject)
         })
     }

From abd783a587b4dd109b38a650ca9a4ebc846b98f7 Mon Sep 17 00:00:00 2001
From: Benny Daon <benny@tuzig.com>
Date: Wed, 25 Oct 2023 18:11:15 +0300
Subject: [PATCH 13/53] Restoring an arrow

---
 aatp/ui/ui.spec.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/aatp/ui/ui.spec.ts b/aatp/ui/ui.spec.ts
index 3bc0717b..66939cd9 100644
--- a/aatp/ui/ui.spec.ts
+++ b/aatp/ui/ui.spec.ts
@@ -89,6 +89,7 @@ insecure=true`)
         await expect(page.locator('#t0')).toBeVisible()
         await sleep(500)
         await page.keyboard.press('ArrowDown')
+        await page.keyboard.press('ArrowDown')
         await page.keyboard.press('Enter')
         await expect(page.locator('.windows-container')).toBeHidden()
     })

From e4f67fe16a26ece7e9b5d35406465bba14964010 Mon Sep 17 00:00:00 2001
From: Benny Daon <benny@tuzig.com>
Date: Thu, 26 Oct 2023 12:55:28 +0300
Subject: [PATCH 14/53] Fixing candidate passing

---
 CHANGELOG.md          | 6 ++++++
 src/webrtc_session.ts | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4fe4045c..7c042086 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,12 @@ will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## Unreleased
+
+### Fixed
+
+- Using only WebRTC to connect to PeerBook
+
 ## [1.8.1] - 2023/9/14
 
 ### Fixed
diff --git a/src/webrtc_session.ts b/src/webrtc_session.ts
index 3499591e..59072ce3 100644
--- a/src/webrtc_session.ts
+++ b/src/webrtc_session.ts
@@ -418,7 +418,7 @@ export class PeerbookSession extends WebRTCSession {
             this.t7.pb.adminCommand({type: "candidate",
                                      args: {
                                          target: this.fp,
-                                         sdp: ev.candidate
+                                         sdp: JSON.stringify(ev.candidate)
                                     }})
         } else {
             terminal7.log("ignoring ice candidate", JSON.stringify(ev.candidate))

From 6d75b6261ccfd8329d353f9779844c26480c0a1b Mon Sep 17 00:00:00 2001
From: Benny Daon <benny@tuzig.com>
Date: Thu, 26 Oct 2023 17:33:28 +0300
Subject: [PATCH 15/53] Adding connection retries

---
 src/gate.ts     |  6 ++++--
 src/peerbook.ts | 19 +++++++++++++------
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/gate.ts b/src/gate.ts
index ffe90923..dd8279e3 100644
--- a/src/gate.ts
+++ b/src/gate.ts
@@ -685,9 +685,11 @@ export class Gate {
         const isNative = Capacitor.isNativePlatform()
         const overPB = this.fp && !this.onlySSH && this.online
         if (overPB) {
-            this.notify("🎌  PeerBook")
-            if (!terminal7.pb.isOpen())
+            if (!terminal7.pb.isOpen()) {
+                this.notify(`${PB} Connecting`)
                 await terminal7.pbConnect()
+            }
+            this.notify("🎌  PeerBook")
             this.session = new PeerbookSession(this.fp)
         } else {
             if (isNative)  {
diff --git a/src/peerbook.ts b/src/peerbook.ts
index bcce57a6..9816d0bc 100644
--- a/src/peerbook.ts
+++ b/src/peerbook.ts
@@ -232,7 +232,7 @@ export class PeerbookConnection {
     }
             
 
-    async connect(token?: string) {
+    async connect(token?: string, count = 0) {
         return new Promise<void>((resolve, reject) =>{
             if (this.session) {
                 if (this.uid == "TBD")
@@ -267,16 +267,23 @@ export class PeerbookConnection {
                     })
                     return
                 }
-                else if (state == 'failed') {
-                    this.stopSpinner()
+                else if (state == 'disconnected' || state == 'failed' || state == 'closed') {
                     // TODO: retry connection
                     // symbol = ERROR_HTML_SYMBOL
+                    this.session.close()
                     this.session = null
-                    console.log("PB webrtc connection failed", failure)
+                    console.log("PB webrtc connection failed", failure, this.uid)
                     if (this.uid == "TBD")
                         reject("Unregistered")
-                    else
-                        reject(failure)
+                    else {
+                        if  (count > 3)
+                            reject(failure)
+                        else {
+                            setTimeout(() => {
+                                this.connect(token, count+1).then(resolve).catch(reject)
+                            }, 100)
+                        }
+                    }
                     return
                 }
             }

From 026b3cf2e4d35dcbae41d30334ad25162b438f16 Mon Sep 17 00:00:00 2001
From: Benny Daon <benny@tuzig.com>
Date: Mon, 30 Oct 2023 08:15:42 +0200
Subject: [PATCH 16/53] Moving PeerBook message handler wher it belongs

---
 src/peerbook.ts  | 82 +++++++++++++++++++++++++++++++++++++++++++-----
 src/terminal7.ts | 68 ---------------------------------------
 2 files changed, 74 insertions(+), 76 deletions(-)

diff --git a/src/peerbook.ts b/src/peerbook.ts
index 9816d0bc..3b4c2f15 100644
--- a/src/peerbook.ts
+++ b/src/peerbook.ts
@@ -10,13 +10,14 @@
 import { CustomerInfo } from "@revenuecat/purchases-typescript-internal-esm"
 
 export const PB = "\uD83D\uDCD6"
+import { Capacitor } from '@capacitor/core'
 import { Device } from '@capacitor/device'
 import { Purchases } from '@revenuecat/purchases-capacitor'
 import { HTTPWebRTCSession } from './webrtc_session'
 import { Gate } from './gate'
+import { PeerbookSession } from "./webrtc_session"
 import { Shell } from './shell'
-import { Capacitor } from '@capacitor/core'
-import {ERROR_HTML_SYMBOL, CLOSED_HTML_SYMBOL, OPEN_HTML_SYMBOL} from './terminal7'
+import {OPEN_HTML_SYMBOL} from './terminal7'
 
 interface PeerbookProps {
     fp: string,
@@ -273,8 +274,8 @@ export class PeerbookConnection {
                     this.session.close()
                     this.session = null
                     console.log("PB webrtc connection failed", failure, this.uid)
-                    if (this.uid == "TBD")
-                        reject("Unregistered")
+                    if (failure == "Unauthorized")
+                        reject(failure)
                     else {
                         if  (count > 3)
                             reject(failure)
@@ -287,10 +288,7 @@ export class PeerbookConnection {
                     return
                 }
             }
-            session.onCMD = (msg) => {
-                console.log("got CMD withtypeof", typeof msg)
-                terminal7.onPBMessage(msg)
-            }
+            session.onCMD = (msg) => this.onMessage(msg)
             session.connect()
         })
     }
@@ -418,4 +416,72 @@ export class PeerbookConnection {
         statusE.innerHTML = OPEN_HTML_SYMBOL
         statusE.style.opacity = "0"
     }
+    // handle incomming peerbook messages
+    async onMessage(m) {
+        const statusE = document.getElementById("peerbook-status")
+        terminal7.log("got pb message", m)
+        if (m["code"] !== undefined) {
+            if (m["code"] == 200) {
+                statusE.innerHTML = OPEN_HTML_SYMBOL
+                this.uid = m["text"]
+            } else
+                // TODO: update statusE
+                terminal7.notify(`{PB}  ${m["text"]}`)
+            return
+        }
+        if (m["peers"] !== undefined) {
+            terminal7.gates = this.syncPeers(terminal7.gates, m.peers)
+            terminal7.map.refresh()
+            return
+        }
+        // TODO: is this needed?
+        if (m["verified"] !== undefined) {
+            if (!m["verified"])
+                temrinal7.notify(`${PB} Unverified client. Please check you email.`)
+            return
+        }
+        const fp = m.source_fp
+        // look for a gate where g.fp == fp
+        const myFP = await terminal7.getFingerprint()
+        if (fp == myFP) {
+            return
+        }
+        let lookup =  terminal7.gates.filter(g => g.fp == fp)
+
+        if (!lookup || (lookup.length != 1)) {
+            if (m["peer_update"] !== undefined) {
+                lookup =  terminal7.gates.filter(g => g.name == m.peer_update.name)
+            }
+            if (!lookup || (lookup.length != 1)) {
+                terminal7.log("Got a pb message with unknown peer: ", fp)
+                return
+            }
+        }
+        const g = lookup[0]
+
+        if (m["peer_update"] !== undefined) {
+            g.online = m.peer_update.online
+            g.verified = m.peer_update.verified
+            if (g.name != m.peer_update.name) {
+                g.name = m.peer_update.name
+                terminal7.storeGates()
+            }
+            await g.updateNameE()
+            return
+        }
+        if (!g.session) {
+            console.log("session is close ignoring message", m)
+            return
+        }
+        const session = g.session as PeerbookSession
+        if (m.candidate !== undefined) {
+            session.peerCandidate(m.candidate)
+            return
+        }
+        if (m.answer !== undefined ) {
+            const answer = JSON.parse(atob(m.answer))
+            session.peerAnswer(answer)
+            return
+        }
+    }
 }
diff --git a/src/terminal7.ts b/src/terminal7.ts
index 6be48cef..324eca2b 100644
--- a/src/terminal7.ts
+++ b/src/terminal7.ts
@@ -32,7 +32,6 @@ import { PeerbookConnection, PB } from './peerbook'
 import { Failure } from './session'
 import { Cell } from "./cell"
 import { Pane } from "./pane"
-import { PeerbookSession } from "./webrtc_session"
 
 declare type NavType = {
     standalone?: boolean
@@ -817,73 +816,6 @@ export class Terminal7 {
             this.focus()
         // TODO: When at home remove the "on" from the home butto
     }
-    // handle incomming peerbook messages (coming over sebsocket)
-    async onPBMessage(m) {
-        const statusE = document.getElementById("peerbook-status")
-        this.log("got pb message", m)
-        if (m["code"] !== undefined) {
-            if (m["code"] == 200) {
-                statusE.innerHTML = OPEN_HTML_SYMBOL
-                this.pb.uid = m["text"]
-            } else
-                // TODO: update statusE
-                this.notify(`\uD83D\uDCD6  ${m["text"]}`)
-            return
-        }
-        if (m["peers"] !== undefined) {
-            this.gates = this.pb.syncPeers(this.gates, m.peers)
-            this.map.refresh()
-            return
-        }
-        if (m["verified"] !== undefined) {
-            if (!m["verified"])
-                this.notify("\uD83D\uDCD6 UNVERIFIED. Please check you email.")
-            return
-        }
-        const fp = m.source_fp
-        // look for a gate where g.fp == fp
-        const myFP = await this.getFingerprint()
-        if (fp == myFP) {
-            return
-        }
-        let lookup =  this.gates.filter(g => g.fp == fp)
-
-        if (!lookup || (lookup.length != 1)) {
-            if (m["peer_update"] !== undefined) {
-                lookup =  this.gates.filter(g => g.name == m.peer_update.name)
-            }
-            if (!lookup || (lookup.length != 1)) {
-                terminal7.log("Got a pb message with unknown peer: ", fp)
-                return
-            }
-        }
-        const g = lookup[0]
-
-        if (m["peer_update"] !== undefined) {
-            g.online = m.peer_update.online
-            g.verified = m.peer_update.verified
-            if (g.name != m.peer_update.name) {
-                g.name = m.peer_update.name
-                this.storeGates()
-            }
-            await g.updateNameE()
-            return
-        }
-        if (!g.session) {
-            console.log("session is close ignoring message", m)
-            return
-        }
-        const session = g.session as PeerbookSession
-        if (m.candidate !== undefined) {
-            session.peerCandidate(m.candidate)
-            return
-        }
-        if (m.answer !== undefined ) {
-            const answer = JSON.parse(atob(m.answer))
-            session.peerAnswer(answer)
-            return
-        }
-    }
     log (...args) {
         let line = ""
         args.forEach(a => line += JSON.stringify(a) + " ")

From f81a2db6489b9497b095f57dbf12471735551f30 Mon Sep 17 00:00:00 2001
From: Benny Daon <benny@tuzig.com>
Date: Mon, 30 Oct 2023 13:11:57 +0200
Subject: [PATCH 17/53] Linting

---
 src/gate.ts           | 18 ++++++------------
 src/peerbook.ts       |  3 +--
 src/session.ts        | 20 ++++++++++++--------
 src/ssh_session.ts    |  6 +++---
 src/webrtc_session.ts | 13 ++++++++-----
 5 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/src/gate.ts b/src/gate.ts
index dd8279e3..5fc6df32 100644
--- a/src/gate.ts
+++ b/src/gate.ts
@@ -9,7 +9,7 @@ import { Clipboard } from '@capacitor/clipboard'
 
 import { Pane } from './pane'
 import { T7Map } from './map'
-import { Failure, Session } from './session'
+import { Failure, Session, Marker } from './session'
 import { PB } from './peerbook'
 import { SSHSession } from './ssh_session'
 import { Terminal7 } from './terminal7'
@@ -39,7 +39,7 @@ export class Gate {
     boarding: boolean
     e: HTMLDivElement
     id: string
-    marker: number
+    marker: Marker
     name: string
     secret: string
     session: PeerbookSession | SSHSession | HTTPWebRTCSession | WebRTCSession | Session | null
@@ -332,16 +332,10 @@ export class Gate {
                 }
                 this.map.shell.onDisconnect(this, isSSH).then(resolve).catch(reject)
             }
-            this.t7.readId().then(({publicKey, privateKey}) => {
-                this.session.reconnect(this.marker).then(layout => handleLauout(layout))
-                .catch(e => {
-                    closeSessionAndDisconnect()
-                    this.t7.log("reconnect failed, calling the shell to handle it", isSSH, e)
-                })
-            }).catch((e) => {
-                this.t7.log("failed to read id", e)
+            this.session.reconnect(this.marker).then(layout => handleLauout(layout))
+            .catch(e => {
                 closeSessionAndDisconnect()
-                resolve()
+                this.t7.log("reconnect failed, calling the shell to handle it", isSSH, e)
             })
         })
     }
@@ -644,7 +638,7 @@ export class Gate {
                 return
             }
             return this.session.disconnect().then(marker => {
-                this.marker = marker as number
+                this.marker = marker
                 resolve()
             }).catch(() => {
                 resolve()
diff --git a/src/peerbook.ts b/src/peerbook.ts
index 3b4c2f15..1c4cf4f3 100644
--- a/src/peerbook.ts
+++ b/src/peerbook.ts
@@ -353,7 +353,6 @@ export class PeerbookConnection {
                 console.log("verifyFP: creating new session")
                 await this.connect()
             }
-            let data
             try {
                 await this.adminCommand({
                     type: "verify",
@@ -437,7 +436,7 @@ export class PeerbookConnection {
         // TODO: is this needed?
         if (m["verified"] !== undefined) {
             if (!m["verified"])
-                temrinal7.notify(`${PB} Unverified client. Please check you email.`)
+                terminal7.notify(`${PB} Unverified client. Please check you email.`)
             return
         }
         const fp = m.source_fp
diff --git a/src/session.ts b/src/session.ts
index 72044f6b..a911cae3 100644
--- a/src/session.ts
+++ b/src/session.ts
@@ -5,6 +5,8 @@ export type ChannelID = number
 export type State = "new" | "connecting" | "connected" | "reconnected" | "disconnected" | "failed" |
     "unauthorized" | "wrong password" | "closed"
 
+export type Marker = number | null
+
 // possible reasons for a failure
 export enum Failure {
     NotImplemented='Not Implemented',
@@ -48,10 +50,10 @@ export interface Session {
     close(): void
     getPayload(): Promise<unknown | void>
     setPayload(payload: unknown): Promise<void>
-    reconnect(marker?: number, publicKey?: string, privateKey?: string): Promise<unknown | void>
-    disconnect(): Promise<number | void>
-    connect(marker?: number, publicKey?: string, privateKey?: string): Promise<void>
-    connect(marker?: number, noCDC?: boolean): Promise<void>
+    reconnect(marker?: Marker, publicKey?: string, privateKey?: string): Promise<unknown | void>
+    disconnect(): Promise<number | null>
+    connect(marker?: Marker, publicKey?: string, privateKey?: string): Promise<void>
+    connect(marker?: Marker, noCDC?: boolean): Promise<void>
     fail(failure?: Failure): void
 }
 
@@ -89,15 +91,17 @@ export abstract class BaseSession implements Session {
         return null
     }
     // TODO: get it to throw "Not Implemented"
+    // eslint-disable-next-line
     async setPayload(payload) {
         console.log(`ignoring set payload: ${JSON.stringify(payload)}`)
     }
-    async reconnect(marker?: number, publicKey?: string, privateKey?: string): Promise<unknown | void> {
+    // eslint-disable-next-line
+    async reconnect(marker?: Marker, publicKey?: string, privateKey?: string): Promise<unknown | void> {
         throw "Not Implemented"
     }
 
     // base disconnect is rejected as it's not supported
-    disconnect(): Promise<void | number> {
+    disconnect(): Promise<null | number> {
         return new Promise((resolve, reject) => {
             reject()
         })
@@ -112,7 +116,7 @@ export abstract class BaseSession implements Session {
     // for reconnect
     abstract openChannel(id: number | string | string[], parent?: number, sx?: number, sy?: number): Promise<Channel>
 
-    abstract connect(marker?: number, publicKey?: string, privateKey?: string): Promise<void>
-    abstract connect(marker?: number, noCDC?: boolean): Promise<void>
+    abstract connect(marker?: Marker, publicKey?: string, privateKey?: string): Promise<void>
+    abstract connect(marker?: Marker, noCDC?: boolean): Promise<void>
 
 }
diff --git a/src/ssh_session.ts b/src/ssh_session.ts
index 6b773b8f..195b92b6 100644
--- a/src/ssh_session.ts
+++ b/src/ssh_session.ts
@@ -1,5 +1,5 @@
 import { SSH, SSHSessionID, StartByPasswd, StartByKey} from 'capacitor-ssh-plugin'
-import { BaseChannel, BaseSession, Failure, Session, ChannelID }  from './session'
+import { BaseChannel, BaseSession, Failure, Session, ChannelID, Marker }  from './session'
 import { WebRTCSession }  from './webrtc_session'
 
 const ACCEPT_CMD = "/usr/local/bin/webexec accept"
@@ -199,7 +199,7 @@ export class HybridSession extends SSHSession {
 
            })
     }
-    async onAcceptData(channelId, marker: number, message) {
+    async onAcceptData(channelId, marker: Marker, message) {
         // null message indicates connect
         if (!message)
             return
@@ -324,7 +324,7 @@ export class HybridSession extends SSHSession {
         else
             return super.setPayload(payload)
     }
-    disconnect(): Promise<number | void> {
+    disconnect(): Promise<number | null> {
         if (this.webrtcSession)
             return this.webrtcSession.disconnect() 
         else
diff --git a/src/webrtc_session.ts b/src/webrtc_session.ts
index 59072ce3..534aba15 100644
--- a/src/webrtc_session.ts
+++ b/src/webrtc_session.ts
@@ -1,5 +1,5 @@
 import { CapacitorHttp, HttpHeaders } from '@capacitor/core';
-import { BaseChannel, BaseSession, Channel, ChannelID, Failure } from './session';
+import { BaseChannel, BaseSession, Channel, ChannelID, Failure, Marker } from './session';
 import { IceServers } from "./terminal7"
 import { ServerPayload } from "./gate"
 
@@ -82,13 +82,16 @@ export class WebRTCSession extends BaseSession {
         this.msgHandlers = new Map()
         this.lastMsgId = 0
     }
+    // eslint-disable-next-line
     onIceCandidate(e: RTCPeerConnectionIceEvent): void { throw new Error("Unimplemented method onIceCandidate()") }
+    // eslint-disable-next-line
     onNegotiationNeeded(ev: Event): void { throw new Error("Unimplemented method onNegotiationNeeded()") }
     public get isSSH() {
         return false
     }
 
-    async connect(marker?: number, noCDC?: boolean | string, privateKey?: string): Promise<void> {
+    // eslint-disable-next-line
+    async connect(marker?: Marker, noCDC?: boolean | string, privateKey?: string): Promise<void> {
         console.log("in connect", marker, noCDC)
 
         if (this.t7.iceServers == null) {
@@ -218,7 +221,7 @@ export class WebRTCSession extends BaseSession {
             }
         })
     }
-    async reconnect(marker?: number, publicKey?: string, privateKey?: string): Promise<void> {
+    async reconnect(marker?: Marker , publicKey?: string, privateKey?: string): Promise<void> {
         return new Promise((resolve, reject) => { 
             console.log("in reconnect", this.cdc, this.cdc.readyState)
             if (!this.pc)
@@ -326,10 +329,10 @@ export class WebRTCSession extends BaseSession {
     }
     // disconnect disconnects from all channels, requests a mark and resolve with
     // the new marker
-    disconnect(): Promise<void> {
+    disconnect(): Promise<number | null> {
         return new Promise((resolve, reject) => {
             if (!this.pc) {
-                resolve()
+                resolve(null)
                 return
             }
             this.closeChannels()

From 1611642544a10c5126f08990e52e32b7fb702cbb Mon Sep 17 00:00:00 2001
From: Benny Daon <benny@tuzig.com>
Date: Mon, 30 Oct 2023 14:27:30 +0200
Subject: [PATCH 18/53] Linting some more

---
 src/ssh_session.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/ssh_session.ts b/src/ssh_session.ts
index 195b92b6..83902533 100644
--- a/src/ssh_session.ts
+++ b/src/ssh_session.ts
@@ -45,7 +45,7 @@ export class SSHSession extends BaseSession {
         this.id = session
         this.onStateChange("connected")
     }
-    async connect(marker?:number, publicKey?: string | boolean, privateKey?: string): Promise<void> {
+    async connect(marker?:Marker, publicKey?: string | boolean, privateKey?: string): Promise<void> {
         terminal7.log("Connecting using SSH", this.address, this.username, this.port)
         SSH.startSessionByKey({
             address: this.address,
@@ -67,7 +67,7 @@ export class SSHSession extends BaseSession {
                     this.onStateChange("failed", Failure.Aborted)
            })
     }
-    passConnect(marker?:number, password?: string) {
+    passConnect(marker?:Marker, password?: string) {
         const args: StartByPasswd = {
             address: this.address,
             port: this.port,
@@ -153,7 +153,7 @@ export class HybridSession extends SSHSession {
      * connect must recieve either password or tag to choose
      * whether to use password or identity key based authentication 
      */
-    async connect(marker?:number, publicKey?: string, privateKey?:string) {
+    async connect(marker?:Marker, publicKey?: string, privateKey?:string) {
 
         const args: StartByKey = {
             address: this.address,
@@ -174,7 +174,7 @@ export class HybridSession extends SSHSession {
                 this.fail(Failure.KeyRejected)
            })
     }
-    passConnect(marker?:number, password?: string) {
+    passConnect(marker?:Marker, password?: string) {
         const args: StartByPasswd = {
             address: this.address,
             port: this.port,
@@ -301,7 +301,7 @@ export class HybridSession extends SSHSession {
             return this.webrtcSession.openChannel(cmd, parent, sx, sy) as unknown as SSHChannel
     }
 
-    async reconnect(marker?: number, publicKey?: string, privateKey?: string) {
+    async reconnect(marker?: Marker, publicKey?: string, privateKey?: string) {
         if (this.webrtcSession)
             return this.webrtcSession.reconnect(marker, privateKey, publicKey)
         else

From f836b7a9eb7b2d30f1191b65b31f13a0e3ee0b03 Mon Sep 17 00:00:00 2001
From: Benny Daon <benny@tuzig.com>
Date: Tue, 31 Oct 2023 08:26:49 +0200
Subject: [PATCH 19/53] Fixing closed connection discovery

---
 src/peerbook.ts       | 14 +++++++++-----
 src/webrtc_session.ts | 12 +++++++++---
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/peerbook.ts b/src/peerbook.ts
index 1c4cf4f3..789c6fdd 100644
--- a/src/peerbook.ts
+++ b/src/peerbook.ts
@@ -236,11 +236,16 @@ export class PeerbookConnection {
     async connect(token?: string, count = 0) {
         return new Promise<void>((resolve, reject) =>{
             if (this.session) {
-                if (this.uid == "TBD")
+                if (this.uid == "TBD") {
                     reject("Unregistered")
-                else
+                    return
+                } else if (this.isOpen()) {
                     resolve()
-                return
+                    return
+                }
+                console.log("Closing existing session connection state:", this.session.pc.connectionState)
+                this.session.close()
+                this.session = null
             }
             // connect to admin over webrtc
             const schema = terminal7.conf.peerbook.insecure? "http" : "https"
@@ -308,8 +313,7 @@ export class PeerbookConnection {
         }
     }
     isOpen() {
-        // TODO: improve this
-        return (this.session != null)
+        return (this.session && this.session.isOpen())
     }
     syncPeers(gates: Array<Gate>, nPeers: Array<Peer>) {
         const ret = []
diff --git a/src/webrtc_session.ts b/src/webrtc_session.ts
index 534aba15..2f38d50c 100644
--- a/src/webrtc_session.ts
+++ b/src/webrtc_session.ts
@@ -433,14 +433,17 @@ export class PeerbookSession extends WebRTCSession {
             const offer = btoa(JSON.stringify(d))
             this.pc.setLocalDescription(d)
             terminal7.log("got offer", offer)
-            if (!terminal7.pb)
-                console.log("no peerbook")
-            else
+            try {
                 terminal7.pb.adminCommand({type: "offer",
                                           args: {
                                               target: this.fp,
                                               sdp: offer
                                           }})
+            } catch(e) {
+                terminal7.log("failed to send offer", e)
+                terminal7.notify("Failed to connect, please try again")
+            }
+
         })
     }
     peerAnswer(offer) {
@@ -530,5 +533,8 @@ export class HTTPWebRTCSession extends WebRTCSession {
             })
         })
     }
+    isOpen(): boolean {
+        return this.pc != null && this.pc.connectionState == "connected"
+    }
 }
 

From 3cfafc66765d9ae7e0acaa7ca6eb30b00aee299c Mon Sep 17 00:00:00 2001
From: Benny Daon <benny@tuzig.com>
Date: Tue, 31 Oct 2023 09:58:53 +0200
Subject: [PATCH 20/53] Updating pods db

---
 ios/App/Podfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ios/App/Podfile.lock b/ios/App/Podfile.lock
index 0bd8c381..2c6472d3 100644
--- a/ios/App/Podfile.lock
+++ b/ios/App/Podfile.lock
@@ -112,4 +112,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 4e9654adb0765b7ee27622f314473ebfafd489a8
 
-COCOAPODS: 1.11.3
+COCOAPODS: 1.12.1

From a431cfa2f28ff0b90b2fa7bc7289467b1c12d262 Mon Sep 17 00:00:00 2001
From: Benny Daon <benny@tuzig.com>
Date: Tue, 31 Oct 2023 14:46:37 +0200
Subject: [PATCH 21/53] Fixing offer after candidate

adding a firstMsg paramter to Peerbook.connect so it'll
be sent before the pending messages
---
 aatp/peerbook_webrtc/admin.spec.ts |  2 +-
 src/commands.ts                    |  2 +-
 src/peerbook.ts                    | 42 ++++++++++++++++--------------
 3 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/aatp/peerbook_webrtc/admin.spec.ts b/aatp/peerbook_webrtc/admin.spec.ts
index 0c7ec8de..3ccd1fa9 100644
--- a/aatp/peerbook_webrtc/admin.spec.ts
+++ b/aatp/peerbook_webrtc/admin.spec.ts
@@ -86,7 +86,7 @@ test.describe('peerbook administration', ()  => {
         await page.evaluate(async () => {
             terminal7.pb.close()
             try {
-                await terminal7.pb.connect("$ValidBearer")
+                await terminal7.pb.connect({token: "$ValidBearer"})
             } catch (e) {
                 console.log("pb.connect failed", e)
                 if (e == "Unregistered")
diff --git a/src/commands.ts b/src/commands.ts
index ed72510f..b45d260d 100644
--- a/src/commands.ts
+++ b/src/commands.ts
@@ -677,7 +677,7 @@ async function subscribeCMD(shell: Shell) {
         }
         terminal7.pb.startSpinner()
         try {
-            await terminal7.pb.connect(customerInfo.originalAppUserId)
+            await terminal7.pb.connect({token: customerInfo.originalAppUserId})
         } catch(e) {
             if (e == "Unregistered") {
                 shell.t.writeln("You are subscribed, please register:")
diff --git a/src/peerbook.ts b/src/peerbook.ts
index 789c6fdd..f7e42d10 100644
--- a/src/peerbook.ts
+++ b/src/peerbook.ts
@@ -38,6 +38,11 @@ interface Peer {
     auth_token?: string
 }
 
+interface ConnectParams {
+    token?: string  // used as the Bearer token
+    firstMsg?: unknown  // first message to send, before all the pending ones
+    count?: number  // internal use for retrying
+}
 export class PeerbookConnection {
     ws: WebSocket = null
     host: string
@@ -47,7 +52,6 @@ export class PeerbookConnection {
     onUpdate: (r: string) => void
     pending: Array<string>
     session: HTTPWebRTCSession | null = null
-    token: string
     shell: Shell
     uid: string
     updatingStore = false
@@ -58,7 +62,6 @@ export class PeerbookConnection {
         // copy all props to this
         Object.assign(this, props)
         this.pending = []
-        this.token = ""
         this.headers = new Map<string, string>()
         this.uid = ""
     }
@@ -67,11 +70,12 @@ export class PeerbookConnection {
         if (!this.session) {
             console.log("Admin command with no session")
             try {
-                await this.connect()
+                await this.connect({firstMsg: msg})
             } catch (e) {
                 console.log("Failed to connect to peerbook", e)
                 throw new Error("Failed to connect")
             }
+            return ""
         }   
         return new Promise((resolve, reject) => {
             this.session.sendCTRLMsg(msg, resolve, reject)
@@ -188,9 +192,8 @@ export class PeerbookConnection {
 
     async onPurchasesUpdate(data) {
         console.log("onPurchasesUpdate", data)
-            // intialize the http headers with the bearer token
         if (this.updatingStore) {
-            terminal7.log("got anotyher evenm while updatingStore")
+            terminal7.log("got another event while updatingStore")
             return
         }
         const active = data.customerInfo.entitlements.active
@@ -203,7 +206,7 @@ export class PeerbookConnection {
         const uid = data.customerInfo.originalAppUserId
         terminal7.log("Subscribed to PB, uid: ", uid)
         try {
-            await this.connect(uid)
+            await this.connect({token: uid})
         } catch (e) {
             terminal7.log("Failed to connect", e)
         } finally {
@@ -231,9 +234,8 @@ export class PeerbookConnection {
             }, reject)
         })
     }
-            
 
-    async connect(token?: string, count = 0) {
+    async connect(params?: ConnectParams) {
         return new Promise<void>((resolve, reject) =>{
             if (this.session) {
                 if (this.uid == "TBD") {
@@ -247,13 +249,14 @@ export class PeerbookConnection {
                 this.session.close()
                 this.session = null
             }
-            // connect to admin over webrtc
             const schema = terminal7.conf.peerbook.insecure? "http" : "https"
             const url = `${schema}://${terminal7.conf.net.peerbook}/we`
-            if (token)
-                this.headers.set("Authorization", `Bearer ${token}`)
+            if (params?.token)
+                this.headers.set("Authorization", `Bearer ${params.token}`)
             const session = new HTTPWebRTCSession(url, this.headers)
             this.session = session
+            if (params?.firstMsg)
+                session.sendCTRLMsg(params.firstMsg, resolve, reject)
             session.onStateChange = (state, failure?) => {
                 if (state == 'connected') {
                     terminal7.log("Connected PB webrtc connection")
@@ -282,13 +285,16 @@ export class PeerbookConnection {
                     if (failure == "Unauthorized")
                         reject(failure)
                     else {
-                        if  (count > 3)
+                        if (!params?.count)
+                            params.count = 0
+                        else if  (params?.count > 2) {
                             reject(failure)
-                        else {
-                            setTimeout(() => {
-                                this.connect(token, count+1).then(resolve).catch(reject)
-                            }, 100)
+                            return
                         }
+                        setTimeout(() => {
+                            params.count++
+                            this.connect(params).then(resolve).catch(reject)
+                        }, 100)
                     }
                     return
                 }
@@ -353,10 +359,6 @@ export class PeerbookConnection {
             } catch(e) {
                 return
             }
-            if (!this.session) {
-                console.log("verifyFP: creating new session")
-                await this.connect()
-            }
             try {
                 await this.adminCommand({
                     type: "verify",

From 3a09e333ce6176fb0a1c97fb4bbdb4c818b13627 Mon Sep 17 00:00:00 2001
From: Benny Daon <benny@tuzig.com>
Date: Wed, 1 Nov 2023 15:03:09 +0200
Subject: [PATCH 22/53] Removing double json

---
 aatp/ui/ui.spec.ts    | 3 +--
 src/gate.ts           | 2 ++
 src/peerbook.ts       | 7 ++++---
 src/webrtc_session.ts | 6 ++----
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/aatp/ui/ui.spec.ts b/aatp/ui/ui.spec.ts
index 66939cd9..016b6f70 100644
--- a/aatp/ui/ui.spec.ts
+++ b/aatp/ui/ui.spec.ts
@@ -85,10 +85,9 @@ insecure=true`)
             window.terminal7.notify = (m) => window.notifications.push(m)
         })
         await connectFirstGate(page)
+        await sleep(500)
         await page.locator('.tabbar .reset').click()
         await expect(page.locator('#t0')).toBeVisible()
-        await sleep(500)
-        await page.keyboard.press('ArrowDown')
         await page.keyboard.press('ArrowDown')
         await page.keyboard.press('Enter')
         await expect(page.locator('.windows-container')).toBeHidden()
diff --git a/src/gate.ts b/src/gate.ts
index 5fc6df32..4a68f47f 100644
--- a/src/gate.ts
+++ b/src/gate.ts
@@ -698,6 +698,8 @@ export class Gate {
         this.session.onCMD = msg => {
             if (msg.type == "set_payload") {
                 this.setLayout(msg.args.payload, true)
+            } else {
+                this.t7.log(`got unknown message ${msg}`)
             }
         }
         this.t7.log("opening session")
diff --git a/src/peerbook.ts b/src/peerbook.ts
index f7e42d10..2e547190 100644
--- a/src/peerbook.ts
+++ b/src/peerbook.ts
@@ -285,7 +285,9 @@ export class PeerbookConnection {
                     if (failure == "Unauthorized")
                         reject(failure)
                     else {
-                        if (!params?.count)
+                        if (!params)
+                            params = {}
+                        if (!params.count)
                             params.count = 0
                         else if  (params?.count > 2) {
                             reject(failure)
@@ -484,8 +486,7 @@ export class PeerbookConnection {
             return
         }
         if (m.answer !== undefined ) {
-            const answer = JSON.parse(atob(m.answer))
-            session.peerAnswer(answer)
+            session.peerAnswer(m.answer)
             return
         }
     }
diff --git a/src/webrtc_session.ts b/src/webrtc_session.ts
index 2f38d50c..76931b83 100644
--- a/src/webrtc_session.ts
+++ b/src/webrtc_session.ts
@@ -421,7 +421,7 @@ export class PeerbookSession extends WebRTCSession {
             this.t7.pb.adminCommand({type: "candidate",
                                      args: {
                                          target: this.fp,
-                                         sdp: JSON.stringify(ev.candidate)
+                                         sdp: ev.candidate
                                     }})
         } else {
             terminal7.log("ignoring ice candidate", JSON.stringify(ev.candidate))
@@ -430,14 +430,12 @@ export class PeerbookSession extends WebRTCSession {
     onNegotiationNeeded(e) {
         terminal7.log("on negotiation needed", e)
         this.pc.createOffer().then(d => {
-            const offer = btoa(JSON.stringify(d))
             this.pc.setLocalDescription(d)
-            terminal7.log("got offer", offer)
             try {
                 terminal7.pb.adminCommand({type: "offer",
                                           args: {
                                               target: this.fp,
-                                              sdp: offer
+                                              sdp: d
                                           }})
             } catch(e) {
                 terminal7.log("failed to send offer", e)

From 09726b899d585e10ff878f52521c1f93664a9e60 Mon Sep 17 00:00:00 2001
From: Benny Daon <benny@tuzig.com>
Date: Thu, 2 Nov 2023 15:51:10 +0200
Subject: [PATCH 23/53] Fixing a glitch

---
 src/peerbook.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/peerbook.ts b/src/peerbook.ts
index 2e547190..59158199 100644
--- a/src/peerbook.ts
+++ b/src/peerbook.ts
@@ -279,7 +279,8 @@ export class PeerbookConnection {
                 else if (state == 'disconnected' || state == 'failed' || state == 'closed') {
                     // TODO: retry connection
                     // symbol = ERROR_HTML_SYMBOL
-                    this.session.close()
+                    if (this.session)
+                        this.session.close()
                     this.session = null
                     console.log("PB webrtc connection failed", failure, this.uid)
                     if (failure == "Unauthorized")

From 3cbb101ff1a1e16f4bfb4572063cd2cc2df2236b Mon Sep 17 00:00:00 2001
From: Benny Daon <benny@tuzig.com>
Date: Thu, 2 Nov 2023 17:53:46 +0200
Subject: [PATCH 24/53] WIP: Supporting WHIP Server

---
 src/gate.ts           |   2 +-
 src/webrtc_session.ts | 134 +++++++++++++++++++++++++++++-------------
 2 files changed, 93 insertions(+), 43 deletions(-)

diff --git a/src/gate.ts b/src/gate.ts
index 4a68f47f..b6e6b460 100644
--- a/src/gate.ts
+++ b/src/gate.ts
@@ -690,7 +690,7 @@ export class Gate {
                 this.session = new SSHSession(this.addr, this.username)
             } else {
                 this.notify("🎌  WebExec HTTP server")
-                const addr = `http://${this.addr}:7777/connect`
+                const addr = `http://${this.addr}:7777/offer`
                 this.session = new HTTPWebRTCSession(addr)
             }
         }
diff --git a/src/webrtc_session.ts b/src/webrtc_session.ts
index 76931b83..d9b72c99 100644
--- a/src/webrtc_session.ts
+++ b/src/webrtc_session.ts
@@ -468,67 +468,117 @@ export class PeerbookSession extends WebRTCSession {
 export class HTTPWebRTCSession extends WebRTCSession {
     address: string
     headers: HttpHeaders
+    sessionUrl: string | null
     constructor(address: string, headers?: Map<string, string>) {
         super()
         this.address = address
-        this.headers = { "Content-Type": "application/json" }
+        this.headers = { "Content-Type": "application/sdp" }
         if (headers)
             headers.forEach((v, k) => this.headers[k] =  v)
+        this.sessionUrl = null
         console.log("new http webrtc session", address, JSON.stringify(this.headers))
     }
 
+    sendOffer(offer: RTCSessionDescriptionInit) {
+        let headers = this.headers
+        headers['Content-Type'] = 'application/sdp'
+        CapacitorHttp.post({
+            url: this.address, 
+            headers: headers,
+            readTimeout: 3000,
+            connectTimeout: 3000,
+            data: offer
+            // webFetchExtra: { mode: 'no-cors' }
+        }).then(response => {
+            if (response.status == 401)
+                this.fail(Failure.Unauthorized)
+            else if (response.status >= 300) {
+                console.log("failed to post to PB", response)
+                if (response.status == 404)
+                    this.fail(Failure.NotSupported)
+                else
+                    this.fail()
+            } else if (response.status == 201) {
+                this.sessionUrl = response.headers['location']
+                return response.data
+            }
+            return null
+        }).then(data => {
+            if (!data)
+                return
+            // TODO move this to the last line of the last then
+            const answer = data
+            const sd = new RTCSessionDescription(answer)
+            if (this.pc)
+                this.pc.setRemoteDescription(sd).catch (() => { 
+                    this.fail(Failure.BadRemoteDescription)
+                })
+        }).catch(error => {
+            console.log(`FAILED: POST to ${this.address} with ${JSON.stringify(this.headers)}`, error)
+            if (error.message == 'unauthorized')
+                this.fail(Failure.Unauthorized)
+            else
+                this.fail(Failure.NotSupported)
+        })
+    }
     onNegotiationNeeded(e) {
         this.t7.log("over HTTP on negotiation needed", e)
         this.pc.createOffer().then(offer => {
             this.pc.setLocalDescription(offer)
+            this.sendOffer(offer)
+        })
+    }
+    sendCandidate(fp: string, ev: RTCPeerConnectionIceEvent) {
+        CapacitorHttp.patch({
+            url: this.sessionUrl, 
+            headers: this.headers,
+            readTimeout: 3000,
+            connectTimeout: 3000,
+            data: ev.candidate,
+            // webFetchExtra: { mode: 'no-cors' }
+        }).then(response => {
+            if (response.status == 401)
+                this.fail(Failure.Unauthorized)
+            else if (response.status >= 300) {
+                console.log("failed to post to PB", response)
+                if (response.status == 404)
+                    this.fail(Failure.NotSupported)
+                else
+                    this.fail()
+            } else
+                return response.data
+            return null
+        }).then(data => {
+            if (!data)
+                return
+            // TODO move this to the last line of the last then
+            const answer = JSON.parse(atob(data))
+            const sd = new RTCSessionDescription(answer)
+            if (this.pc)
+                this.pc.setRemoteDescription(sd).catch (() => { 
+                    this.fail(Failure.BadRemoteDescription)
+                })
+        }).catch(error => {
+            console.log(`FAILED: POST to ${this.address} with ${JSON.stringify(this.headers)}`, error)
+            if (error.message == 'unauthorized')
+                this.fail(Failure.Unauthorized)
+            else
+                this.fail(Failure.NotSupported)
         })
     }
     onIceCandidate(ev: RTCPeerConnectionIceEvent) {
         console.log("got ice candidate", ev)
-        if (ev.candidate != null)
-            return
-        this.t7.getFingerprint().then(fp => {
-            const encodedO = btoa(JSON.stringify(this.pc.localDescription))
-            console.log("sending offer with headers ", this.headers, fp)
-            CapacitorHttp.post({
-                url: this.address, 
-                headers: this.headers,
+        if (ev.candidate == null) {
+            // DELETE the session
+            CapacitorHttp.delete({
+                url: this.sessionUrl,
                 readTimeout: 3000,
                 connectTimeout: 3000,
-                data: {api_version: 0,
-                    offer: encodedO,
-                    fingerprint: fp,
-                },
-                // webFetchExtra: { mode: 'no-cors' }
-            }).then(response => {
-                if (response.status == 401)
-                    this.fail(Failure.Unauthorized)
-                else if (response.status >= 300) {
-                    console.log("failed to post to PB", response)
-                    if (response.status == 404)
-                        this.fail(Failure.NotSupported)
-                    else
-                        this.fail()
-                } else
-                    return response.data
-                return null
-            }).then(data => {
-                if (!data)
-                    return
-                // TODO move this to the last line of the last then
-                const answer = JSON.parse(atob(data))
-                const sd = new RTCSessionDescription(answer)
-                if (this.pc)
-                    this.pc.setRemoteDescription(sd).catch (() => { 
-                        this.fail(Failure.BadRemoteDescription)
-                    })
-            }).catch(error => {
-                console.log(`FAILED: POST to ${this.address} with ${JSON.stringify(this.headers)}`, error)
-                if (error.message == 'unauthorized')
-                    this.fail(Failure.Unauthorized)
-                else
-                    this.fail(Failure.NotSupported)
             })
+            return
+        }
+        this.t7.getFingerprint().then(fp => {
+            this.sendCandidate(fp, ev)
         })
     }
     isOpen(): boolean {

From bc06e4d87a9b407541a7d2123e02b7ed0ca288d9 Mon Sep 17 00:00:00 2001
From: DmitryPorotov <DmitryPorotov@gmail.com>
Date: Wed, 1 Nov 2023 09:02:33 +0200
Subject: [PATCH 25/53] Adding html titles (tooltips) to buttons for mouse
 users (#425)

---
 index.html | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/index.html b/index.html
index f30ebbb2..1f07c0fc 100644
--- a/index.html
+++ b/index.html
@@ -191,16 +191,20 @@ <h1 class="warning">Network is down</h1>
       </div>
   </div>
   <nav id="navbar" class="bar">
-          <button type="button" id="map-button" class="off"><i class="f7-icons">map</i></button>
-          <button type="button" id="log-button"><i class="f7-icons">greaterthan</i></button>
-          <button type="button" id="trash-button" class="pane-buttons off"><i class="f7-icons">rectangle_fill_badge_xmark</i></button>
-          <button type="button" id="divide-h" class="pane-buttons off"><i class="f7-icons">divide</i></button>
-          <button type="button" id="divide-v" class="pane-buttons off">
+          <button type="button" id="map-button" class="off" title="Map"><i class="f7-icons">map</i></button>
+          <button type="button" id="log-button" title="Log"><i class="f7-icons">greaterthan</i></button>
+          <button type="button" id="trash-button" class="pane-buttons off" title="Close pane">
+              <i class="f7-icons">rectangle_fill_badge_xmark</i></button>
+          <button type="button" id="divide-h" class="pane-buttons off" title="Split horizontally">
+              <i class="f7-icons">divide</i></button>
+          <button type="button" id="divide-v" class="pane-buttons off" title="Split vertically">
               <i class="f7-icons" style="display: inline-block; transform: rotate(90deg);">divide</i></button>
-          <button type="button" id="search-button" class="pane-buttons off"><i class="f7-icons">doc_text_search</i></button>
-          <button type="button" id="video-button" class="pane-buttons off"><i class="f7-icons">videocam</i></button>
-          <button type="button" id="help-button"><i class="f7-icons">question</i></button>
-          <button type="button" id="dotfile-button"><i class="f7-icons">gear</i></button>
+          <button type="button" id="search-button" class="pane-buttons off" title="Search">
+              <i class="f7-icons">doc_text_search</i></button>
+          <button type="button" id="video-button" class="pane-buttons off" title="Video">
+              <i class="f7-icons">videocam</i></button>
+          <button type="button" id="help-button"><i class="f7-icons" title="Help">question</i></button>
+          <button type="button" id="dotfile-button"><i class="f7-icons" title="Dotfile config">gear</i></button>
   </nav>
 
     <template id="lose-state-template">
@@ -267,11 +271,11 @@ <h1><span class="name"></span> Error</h1>
         </div>
     </template>
     <nav class="tabbar">
-          <button type="button" class="add-tab"><i class="f7-icons">
+          <button type="button" class="add-tab" title="Add pane"><i class="f7-icons">
                   plus</i></button>
           <nav class="tabbar-names">
           </nav>
-          <button type="button" class="reset"><i class="f7-icons">
+          <button type="button" class="reset" title="Reset connection"><i class="f7-icons">
                   arrow_2_circlepath</i></button>
     </nav>
 </template>

From 80fc2135c5ae02a26dd415c10249d06bee1b8caf Mon Sep 17 00:00:00 2001
From: Benny Daon <benny@tuzig.com>
Date: Mon, 6 Nov 2023 10:28:47 +0200
Subject: [PATCH 26/53] Adding support for latest peerbook

---
 aatp/http_webrtc/lab.yaml          | 2 ++
 aatp/infra/webexec/docker_entry.sh | 3 ++-
 aatp/ui/lab.yaml                   | 2 ++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/aatp/http_webrtc/lab.yaml b/aatp/http_webrtc/lab.yaml
index 3e4ac83d..8c64f2d5 100644
--- a/aatp/http_webrtc/lab.yaml
+++ b/aatp/http_webrtc/lab.yaml
@@ -26,6 +26,8 @@ services:
       dockerfile: ./aatp/infra/webexec/Dockerfile
       args:
         REF: ${WEBEXEC_REF-master}
+    environment:
+      WEBEXEC_SERVER_URL: http://webexec:7777
     volumes:
       - ./aatp/http_webrtc/webexec_conf:/conf
       - webexec_auth:/auth
diff --git a/aatp/infra/webexec/docker_entry.sh b/aatp/infra/webexec/docker_entry.sh
index 5dfd6797..25bbac06 100644
--- a/aatp/infra/webexec/docker_entry.sh
+++ b/aatp/infra/webexec/docker_entry.sh
@@ -20,6 +20,7 @@ then
     /scripts/wait-for-it.sh -h peerbook -p 17777
 fi
 while true
+env 
 do
-    su - runner -c '/usr/local/bin/webexec start --debug'
+    su - runner -c "WEBEXEC_SERVER_URL=$WEBEXEC_SERVER_URL /usr/local/bin/webexec start --debug"
 done
diff --git a/aatp/ui/lab.yaml b/aatp/ui/lab.yaml
index 99c15dac..002e605b 100644
--- a/aatp/ui/lab.yaml
+++ b/aatp/ui/lab.yaml
@@ -26,6 +26,8 @@ services:
       dockerfile: ./aatp/infra/webexec/Dockerfile
       args:
         REF: ${WEBEXEC_REF-master}
+    environment:
+      WEBEXEC_SERVER_URL: http://webexec:7777
     volumes:
       - ./aatp/ui/webexec_conf:/conf
       - webexec_auth:/auth

From 9e33acdebd48e6d179c196347e0d6186d1fb9881 Mon Sep 17 00:00:00 2001
From: Benny Daon <benny@tuzig.com>
Date: Mon, 6 Nov 2023 10:31:25 +0200
Subject: [PATCH 27/53] Improving tests stability

---
 aatp/ui/ui.spec.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/aatp/ui/ui.spec.ts b/aatp/ui/ui.spec.ts
index 016b6f70..776f9937 100644
--- a/aatp/ui/ui.spec.ts
+++ b/aatp/ui/ui.spec.ts
@@ -82,6 +82,9 @@ insecure=true`)
         await page.reload({waitUntil: "networkidle"})
         await page.evaluate(async () => {
             window.notifications = []
+            while (!window.terminal7) {
+                await new Promise(r => setTimeout(r, 100))
+            }
             window.terminal7.notify = (m) => window.notifications.push(m)
         })
         await connectFirstGate(page)

From 011764e640fe05b9dba4145528d6b6e8b69fc28c Mon Sep 17 00:00:00 2001
From: Benny Daon <benny@tuzig.com>
Date: Mon, 6 Nov 2023 10:34:13 +0200
Subject: [PATCH 28/53] Upgrading capacitor

---
 ios/App/Podfile      |   13 +-
 ios/App/Podfile.lock |   16 +-
 package.json         |    5 +-
 yarn.lock            | 1154 +++++++++++++++++++++---------------------
 4 files changed, 601 insertions(+), 587 deletions(-)

diff --git a/ios/App/Podfile b/ios/App/Podfile
index 47c4d0b7..8a3992de 100644
--- a/ios/App/Podfile
+++ b/ios/App/Podfile
@@ -1,15 +1,4 @@
-def assertDeploymentTarget(installer)
-  installer.pods_project.targets.each do |target|
-    target.build_configurations.each do |config|
-      # ensure IPHONEOS_DEPLOYMENT_TARGET is at least 13.0
-      deployment_target = config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'].to_f
-      should_upgrade = deployment_target < 13.0 && deployment_target != 0.0
-      if should_upgrade
-        config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '13.0'
-      end
-    end
-  end
-end
+require_relative '../../node_modules/@capacitor/ios/scripts/pods_helpers'
 platform :ios, '15.4'
 use_frameworks!
 
diff --git a/ios/App/Podfile.lock b/ios/App/Podfile.lock
index 2c6472d3..7d930bb3 100644
--- a/ios/App/Podfile.lock
+++ b/ios/App/Podfile.lock
@@ -1,15 +1,15 @@
 PODS:
-  - Capacitor (5.3.0):
+  - Capacitor (5.5.1):
     - CapacitorCordova
   - CapacitorApp (5.0.6):
     - Capacitor
-  - CapacitorBrowser (5.0.6):
+  - CapacitorBrowser (5.1.0):
     - Capacitor
   - CapacitorCamera (5.0.7):
     - Capacitor
   - CapacitorClipboard (5.0.6):
     - Capacitor
-  - CapacitorCordova (5.3.0)
+  - CapacitorCordova (5.5.1)
   - CapacitorDevice (5.0.6):
     - Capacitor
   - CapacitorKeyboard (5.0.6):
@@ -91,12 +91,12 @@ EXTERNAL SOURCES:
     :path: "../../node_modules/@revenuecat/purchases-capacitor"
 
 SPEC CHECKSUMS:
-  Capacitor: 1ac9165943bc4f2137642d218c5ba05df811de69
+  Capacitor: 9da0a2415e3b6098511f8b5ffdb578d91ee79f8f
   CapacitorApp: 024e1b1bea5f883d79f6330d309bc441c88ad04a
-  CapacitorBrowser: 6192948e0ce804fd72aaf77f4114a3ad2e08c760
+  CapacitorBrowser: 7a0fb6a1011abfaaf2dfedfd8248f942a8eda3d6
   CapacitorCamera: 084b0b228bba7d00587910337b1c89e93b1d32ab
   CapacitorClipboard: 77edf49827ea21da2a9c05c690a4a6a4d07199c4
-  CapacitorCordova: b9374d68e63ce29e96ab5db994cf14fbefd722c9
+  CapacitorCordova: e128cc7688c070ca0bfa439898a5f609da8dbcfe
   CapacitorDevice: 2c968f98a1ec4d22357418c1521e7ddc46c675e6
   CapacitorKeyboard: b978154b024a5f65e044908e37d15b7de58b9d12
   CapacitorNativeBiometric: b47637a8cd349bdac014424bb4ddcae9ee5d4919
@@ -110,6 +110,6 @@ SPEC CHECKSUMS:
   RevenueCat: 84fbe2eb9bbf63e1abf346ccd3ff9ee45d633e3b
   RevenuecatPurchasesCapacitor: c0de310959a58b3217acd7ec5ce981175bb050b1
 
-PODFILE CHECKSUM: 4e9654adb0765b7ee27622f314473ebfafd489a8
+PODFILE CHECKSUM: b1f79f7d62e59482e73924f44c49c50186ac72be
 
-COCOAPODS: 1.12.1
+COCOAPODS: 1.11.3
diff --git a/package.json b/package.json
index 15703ada..7294877b 100644
--- a/package.json
+++ b/package.json
@@ -73,13 +73,12 @@
     "start": "npm run dev",
     "dev": "vite",
     "stage": "vite build --sourcemap && vite preview",
-    "run": "cap run ios",
+    "run": "vite build -c vite.dev.config.js && cap run ios",
     "test": "vitest",
     "build": "vite build -c vite.dev.config.js",
     "clean": "rm -rf dist ios/App/App/public/*",
     "aatp": "bash ./aatp/run",
-    "lint": "npx eslint aatp src --ext .js,.ts && npx tsc --noEmit --target es2022 --moduleResolution node src/*.ts",
-    "capacitor:copy:before": "npm run build"
+    "lint": "npx eslint aatp src --ext .js,.ts && npx tsc --noEmit --target es2022 --moduleResolution node src/*.ts"
   },
   "repository": {
     "type": "git",
diff --git a/yarn.lock b/yarn.lock
index 5cbb7d52..6e3c0072 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -32,42 +32,32 @@
     "@babel/highlight" "^7.22.13"
     chalk "^2.4.2"
 
-"@babel/compat-data@^7.22.6", "@babel/compat-data@^7.22.9":
-  version "7.22.9"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.22.9.tgz#71cdb00a1ce3a329ce4cbec3a44f9fef35669730"
-  integrity sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ==
+"@babel/compat-data@^7.22.6", "@babel/compat-data@^7.22.9", "@babel/compat-data@^7.23.2":
+  version "7.23.2"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.23.2.tgz#6a12ced93455827037bfb5ed8492820d60fc32cc"
+  integrity sha512-0S9TQMmDHlqAZ2ITT95irXKfxN9bncq8ZCoJhun3nHL/lLUxd2NKBJYoNGWH7S0hz6fRQwWlAWn/ILM0C70KZQ==
 
 "@babel/core@^7.11.1":
-  version "7.22.15"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.22.15.tgz#15d4fd03f478a459015a4b94cfbb3bd42c48d2f4"
-  integrity sha512-PtZqMmgRrvj8ruoEOIwVA3yoF91O+Hgw9o7DAUTNBA6Mo2jpu31clx9a7Nz/9JznqetTR6zwfC4L3LAjKQXUwA==
+  version "7.23.2"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.23.2.tgz#ed10df0d580fff67c5f3ee70fd22e2e4c90a9f94"
+  integrity sha512-n7s51eWdaWZ3vGT2tD4T7J6eJs3QoBXydv7vkUM06Bf1cbVD2Kc2UrkzhiQwobfV7NwOnQXYL7UBJ5VPU+RGoQ==
   dependencies:
     "@ampproject/remapping" "^2.2.0"
     "@babel/code-frame" "^7.22.13"
-    "@babel/generator" "^7.22.15"
+    "@babel/generator" "^7.23.0"
     "@babel/helper-compilation-targets" "^7.22.15"
-    "@babel/helper-module-transforms" "^7.22.15"
-    "@babel/helpers" "^7.22.15"
-    "@babel/parser" "^7.22.15"
+    "@babel/helper-module-transforms" "^7.23.0"
+    "@babel/helpers" "^7.23.2"
+    "@babel/parser" "^7.23.0"
     "@babel/template" "^7.22.15"
-    "@babel/traverse" "^7.22.15"
-    "@babel/types" "^7.22.15"
-    convert-source-map "^1.7.0"
+    "@babel/traverse" "^7.23.2"
+    "@babel/types" "^7.23.0"
+    convert-source-map "^2.0.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
     json5 "^2.2.3"
     semver "^6.3.1"
 
-"@babel/generator@^7.22.15":
-  version "7.22.15"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.22.15.tgz#1564189c7ec94cb8f77b5e8a90c4d200d21b2339"
-  integrity sha512-Zu9oWARBqeVOW0dZOjXc3JObrzuqothQ3y/n1kUtrjCoCPLkXUwMvOo/F/TCfoHMbWIFlWwpZtkZVb9ga4U2pA==
-  dependencies:
-    "@babel/types" "^7.22.15"
-    "@jridgewell/gen-mapping" "^0.3.2"
-    "@jridgewell/trace-mapping" "^0.3.17"
-    jsesc "^2.5.1"
-
 "@babel/generator@^7.23.0":
   version "7.23.0"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.0.tgz#df5c386e2218be505b34837acbcb874d7a983420"
@@ -127,10 +117,10 @@
     regexpu-core "^5.3.1"
     semver "^6.3.1"
 
-"@babel/helper-define-polyfill-provider@^0.4.2":
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.2.tgz#82c825cadeeeee7aad237618ebbe8fa1710015d7"
-  integrity sha512-k0qnnOqHn5dK9pZpfD5XXZ9SojAITdCKRn2Lp6rnDGzIbaP0rHyMPk/4wsSxVBVz4RfN0q6VpXWP2pDGIoQ7hw==
+"@babel/helper-define-polyfill-provider@^0.4.3":
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.3.tgz#a71c10f7146d809f4a256c373f462d9bba8cf6ba"
+  integrity sha512-WBrLmuPP47n7PNwsZ57pqam6G/RGo1vw/87b0Blc53tZNGZ4x7YvZ6HgQe2vo1W/FR20OgjeZuGXzudPiXHFug==
   dependencies:
     "@babel/helper-compilation-targets" "^7.22.6"
     "@babel/helper-plugin-utils" "^7.22.5"
@@ -138,25 +128,12 @@
     lodash.debounce "^4.0.8"
     resolve "^1.14.2"
 
-"@babel/helper-environment-visitor@^7.22.20":
+"@babel/helper-environment-visitor@^7.22.20", "@babel/helper-environment-visitor@^7.22.5":
   version "7.22.20"
   resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz#96159db61d34a29dba454c959f5ae4a649ba9167"
   integrity sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==
 
-"@babel/helper-environment-visitor@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz#f06dd41b7c1f44e1f8da6c4055b41ab3a09a7e98"
-  integrity sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q==
-
-"@babel/helper-function-name@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz#ede300828905bb15e582c037162f99d5183af1be"
-  integrity sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==
-  dependencies:
-    "@babel/template" "^7.22.5"
-    "@babel/types" "^7.22.5"
-
-"@babel/helper-function-name@^7.23.0":
+"@babel/helper-function-name@^7.22.5", "@babel/helper-function-name@^7.23.0":
   version "7.23.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz#1f9a3cdbd5b2698a670c30d2735f9af95ed52759"
   integrity sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==
@@ -171,12 +148,12 @@
   dependencies:
     "@babel/types" "^7.22.5"
 
-"@babel/helper-member-expression-to-functions@^7.22.15", "@babel/helper-member-expression-to-functions@^7.22.5":
-  version "7.22.15"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.22.15.tgz#b95a144896f6d491ca7863576f820f3628818621"
-  integrity sha512-qLNsZbgrNh0fDQBCPocSL8guki1hcPvltGDv/NxvUoABwFq7GkKSu1nRXeJkVZc+wJvne2E0RKQz+2SQrz6eAA==
+"@babel/helper-member-expression-to-functions@^7.22.15":
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.23.0.tgz#9263e88cc5e41d39ec18c9a3e0eced59a3e7d366"
+  integrity sha512-6gfrPwh7OuT6gZyJZvd6WbTfrqAo7vm4xCzAXOusKqq/vWdKXphTpj5klHKNmRUU6/QRGlBsyU9mAIPaWHlqJA==
   dependencies:
-    "@babel/types" "^7.22.15"
+    "@babel/types" "^7.23.0"
 
 "@babel/helper-module-imports@^7.10.4", "@babel/helper-module-imports@^7.22.15", "@babel/helper-module-imports@^7.22.5":
   version "7.22.15"
@@ -185,16 +162,16 @@
   dependencies:
     "@babel/types" "^7.22.15"
 
-"@babel/helper-module-transforms@^7.22.15", "@babel/helper-module-transforms@^7.22.5", "@babel/helper-module-transforms@^7.22.9":
-  version "7.22.15"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.22.15.tgz#40ad2f6950f143900e9c1c72363c0b431a606082"
-  integrity sha512-l1UiX4UyHSFsYt17iQ3Se5pQQZZHa22zyIXURmvkmLCD4t/aU+dvNWHatKac/D9Vm9UES7nvIqHs4jZqKviUmQ==
+"@babel/helper-module-transforms@^7.22.5", "@babel/helper-module-transforms@^7.23.0":
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.23.0.tgz#3ec246457f6c842c0aee62a01f60739906f7047e"
+  integrity sha512-WhDWw1tdrlT0gMgUJSlX0IQvoO1eN279zrAUbVB+KpV2c3Tylz8+GnKOLllCS6Z/iZQEyVYxhZVUdPTqs2YYPw==
   dependencies:
-    "@babel/helper-environment-visitor" "^7.22.5"
+    "@babel/helper-environment-visitor" "^7.22.20"
     "@babel/helper-module-imports" "^7.22.15"
     "@babel/helper-simple-access" "^7.22.5"
     "@babel/helper-split-export-declaration" "^7.22.6"
-    "@babel/helper-validator-identifier" "^7.22.15"
+    "@babel/helper-validator-identifier" "^7.22.20"
 
 "@babel/helper-optimise-call-expression@^7.22.5":
   version "7.22.5"
@@ -208,22 +185,22 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz#dd7ee3735e8a313b9f7b05a773d892e88e6d7295"
   integrity sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==
 
-"@babel/helper-remap-async-to-generator@^7.22.5", "@babel/helper-remap-async-to-generator@^7.22.9":
-  version "7.22.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.9.tgz#53a25b7484e722d7efb9c350c75c032d4628de82"
-  integrity sha512-8WWC4oR4Px+tr+Fp0X3RHDVfINGpF3ad1HIbrc8A77epiR6eMMc6jsgozkzT2uDiOOdoS9cLIQ+XD2XvI2WSmQ==
+"@babel/helper-remap-async-to-generator@^7.22.20", "@babel/helper-remap-async-to-generator@^7.22.5":
+  version "7.22.20"
+  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.20.tgz#7b68e1cb4fa964d2996fd063723fb48eca8498e0"
+  integrity sha512-pBGyV4uBqOns+0UvhsTO8qgl8hO89PmiDYv+/COyp1aeMcmfrfruz+/nCMFiYyFF/Knn0yfrC85ZzNFjembFTw==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.22.5"
-    "@babel/helper-environment-visitor" "^7.22.5"
-    "@babel/helper-wrap-function" "^7.22.9"
+    "@babel/helper-environment-visitor" "^7.22.20"
+    "@babel/helper-wrap-function" "^7.22.20"
 
 "@babel/helper-replace-supers@^7.22.5", "@babel/helper-replace-supers@^7.22.9":
-  version "7.22.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.22.9.tgz#cbdc27d6d8d18cd22c81ae4293765a5d9afd0779"
-  integrity sha512-LJIKvvpgPOPUThdYqcX6IXRuIcTkcAub0IaDRGCZH0p5GPUp7PhRU9QVgFcDDd51BaPkk77ZjqFwh6DZTAEmGg==
+  version "7.22.20"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.22.20.tgz#e37d367123ca98fe455a9887734ed2e16eb7a793"
+  integrity sha512-qsW0In3dbwQUbK8kejJ4R7IHVGwHJlV6lpG6UA7a9hSa2YEiAib+N1T2kr6PEeUT+Fl7najmSOS6SmAwCHK6Tw==
   dependencies:
-    "@babel/helper-environment-visitor" "^7.22.5"
-    "@babel/helper-member-expression-to-functions" "^7.22.5"
+    "@babel/helper-environment-visitor" "^7.22.20"
+    "@babel/helper-member-expression-to-functions" "^7.22.15"
     "@babel/helper-optimise-call-expression" "^7.22.5"
 
 "@babel/helper-simple-access@^7.22.5":
@@ -252,11 +229,6 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz#533f36457a25814cf1df6488523ad547d784a99f"
   integrity sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==
 
-"@babel/helper-validator-identifier@^7.22.15", "@babel/helper-validator-identifier@^7.22.5":
-  version "7.22.15"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.15.tgz#601fa28e4cc06786c18912dca138cec73b882044"
-  integrity sha512-4E/F9IIEi8WR94324mbDUMo074YTheJmd7eZF5vITTeYchqAi6sYXRLHUVsmkdmY4QjfKTcB2jB7dVP3NaBElQ==
-
 "@babel/helper-validator-identifier@^7.22.20":
   version "7.22.20"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz#c4ae002c61d2879e724581d96665583dbc1dc0e0"
@@ -267,39 +239,34 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.22.15.tgz#694c30dfa1d09a6534cdfcafbe56789d36aba040"
   integrity sha512-bMn7RmyFjY/mdECUbgn9eoSY4vqvacUnS9i9vGAGttgFWesO6B4CYWA7XlpbWgBt71iv/hfbPlynohStqnu5hA==
 
-"@babel/helper-wrap-function@^7.22.9":
-  version "7.22.10"
-  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.22.10.tgz#d845e043880ed0b8c18bd194a12005cb16d2f614"
-  integrity sha512-OnMhjWjuGYtdoO3FmsEFWvBStBAe2QOgwOLsLNDjN+aaiMD8InJk1/O3HSD8lkqTjCgg5YI34Tz15KNNA3p+nQ==
+"@babel/helper-wrap-function@^7.22.20":
+  version "7.22.20"
+  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.22.20.tgz#15352b0b9bfb10fc9c76f79f6342c00e3411a569"
+  integrity sha512-pms/UwkOpnQe/PDAEdV/d7dVCoBbB+R4FvYoHGZz+4VPcg7RtYy2KP7S2lbuWM6FCSgob5wshfGESbC/hzNXZw==
   dependencies:
     "@babel/helper-function-name" "^7.22.5"
-    "@babel/template" "^7.22.5"
-    "@babel/types" "^7.22.10"
+    "@babel/template" "^7.22.15"
+    "@babel/types" "^7.22.19"
 
-"@babel/helpers@^7.22.15":
-  version "7.22.15"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.22.15.tgz#f09c3df31e86e3ea0b7ff7556d85cdebd47ea6f1"
-  integrity sha512-7pAjK0aSdxOwR+CcYAqgWOGy5dcfvzsTIfFTb2odQqW47MDfv14UaJDY6eng8ylM2EaeKXdxaSWESbkmaQHTmw==
+"@babel/helpers@^7.23.2":
+  version "7.23.2"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.23.2.tgz#2832549a6e37d484286e15ba36a5330483cac767"
+  integrity sha512-lzchcp8SjTSVe/fPmLwtWVBFC7+Tbn8LGHDVfDp9JGxpAY5opSaEFgt8UQvrnECWOTdji2mOWMz1rOhkHscmGQ==
   dependencies:
     "@babel/template" "^7.22.15"
-    "@babel/traverse" "^7.22.15"
-    "@babel/types" "^7.22.15"
+    "@babel/traverse" "^7.23.2"
+    "@babel/types" "^7.23.0"
 
 "@babel/highlight@^7.22.13":
-  version "7.22.13"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.22.13.tgz#9cda839e5d3be9ca9e8c26b6dd69e7548f0cbf16"
-  integrity sha512-C/BaXcnnvBCmHTpz/VGZ8jgtE2aYlW4hxDhseJAWZb7gqGM/qtCK6iZUb0TyKFf7BOUsBH7Q7fkRsDRhg1XklQ==
+  version "7.22.20"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.22.20.tgz#4ca92b71d80554b01427815e06f2df965b9c1f54"
+  integrity sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.22.5"
+    "@babel/helper-validator-identifier" "^7.22.20"
     chalk "^2.4.2"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.22.15":
-  version "7.22.15"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.22.15.tgz#d34592bfe288a32e741aa0663dbc4829fcd55160"
-  integrity sha512-RWmQ/sklUN9BvGGpCDgSubhHWfAx24XDTDObup4ffvxaYsptOg2P3KG0j+1eWKLxpkX0j0uHxmpq2Z1SP/VhxA==
-
-"@babel/parser@^7.23.0":
+"@babel/parser@^7.22.15", "@babel/parser@^7.23.0":
   version "7.23.0"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.0.tgz#da950e622420bf96ca0d0f2909cdddac3acd8719"
   integrity sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==
@@ -459,14 +426,14 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-async-generator-functions@^7.22.15":
-  version "7.22.15"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.22.15.tgz#3b153af4a6b779f340d5b80d3f634f55820aefa3"
-  integrity sha512-jBm1Es25Y+tVoTi5rfd5t1KLmL8ogLKpXszboWOTTtGFGz2RKnQe2yn7HbZ+kb/B8N0FVSGQo874NSlOU1T4+w==
+"@babel/plugin-transform-async-generator-functions@^7.23.2":
+  version "7.23.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.2.tgz#054afe290d64c6f576f371ccc321772c8ea87ebb"
+  integrity sha512-BBYVGxbDVHfoeXbOwcagAkOQAm9NxoTdMGfTqghu1GrvadSaw6iW3Je6IcL5PNOw8VwjxqBECXy50/iCQSY/lQ==
   dependencies:
-    "@babel/helper-environment-visitor" "^7.22.5"
+    "@babel/helper-environment-visitor" "^7.22.20"
     "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-remap-async-to-generator" "^7.22.9"
+    "@babel/helper-remap-async-to-generator" "^7.22.20"
     "@babel/plugin-syntax-async-generators" "^7.8.4"
 
 "@babel/plugin-transform-async-to-generator@^7.22.5":
@@ -485,10 +452,10 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-block-scoping@^7.22.15":
-  version "7.22.15"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.22.15.tgz#494eb82b87b5f8b1d8f6f28ea74078ec0a10a841"
-  integrity sha512-G1czpdJBZCtngoK1sJgloLiOHUnkb/bLZwqVZD8kXmq0ZnVfTTWUcs9OWtp0mBtYJ+4LQY1fllqBkOIPhXmFmw==
+"@babel/plugin-transform-block-scoping@^7.23.0":
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.23.0.tgz#8744d02c6c264d82e1a4bc5d2d501fd8aff6f022"
+  integrity sha512-cOsrbmIOXmf+5YbL99/S49Y3j46k/T16b9ml8bm9lP6N9US5iQ2yBK7gpui1pg0V/WMcXdkfKbTb7HXq9u+v4g==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
@@ -532,10 +499,10 @@
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/template" "^7.22.5"
 
-"@babel/plugin-transform-destructuring@^7.22.15":
-  version "7.22.15"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.22.15.tgz#e7404ea5bb3387073b9754be654eecb578324694"
-  integrity sha512-HzG8sFl1ZVGTme74Nw+X01XsUTqERVQ6/RLHo3XjGRzm7XD6QTtfS3NJotVgCGy8BzkDqRjRBD8dAyJn5TuvSQ==
+"@babel/plugin-transform-destructuring@^7.23.0":
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.23.0.tgz#6447aa686be48b32eaf65a73e0e2c0bd010a266c"
+  integrity sha512-vaMdgNXFkYrB+8lbgniSYWHsgqK5gjaMNcc84bMIOMRLH0L9AqYq3hwMdvnyqj1OPqea8UtjPEuS/DCenah1wg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
@@ -624,32 +591,32 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-modules-amd@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.22.5.tgz#4e045f55dcf98afd00f85691a68fc0780704f526"
-  integrity sha512-R+PTfLTcYEmb1+kK7FNkhQ1gP4KgjpSO6HfH9+f8/yfp2Nt3ggBjiVpRwmwTlfqZLafYKJACy36yDXlEmI9HjQ==
+"@babel/plugin-transform-modules-amd@^7.23.0":
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.23.0.tgz#05b2bc43373faa6d30ca89214731f76f966f3b88"
+  integrity sha512-xWT5gefv2HGSm4QHtgc1sYPbseOyf+FFDo2JbpE25GWl5BqTGO9IMwTYJRoIdjsF85GE+VegHxSCUt5EvoYTAw==
   dependencies:
-    "@babel/helper-module-transforms" "^7.22.5"
+    "@babel/helper-module-transforms" "^7.23.0"
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-modules-commonjs@^7.22.15":
-  version "7.22.15"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.22.15.tgz#b11810117ed4ee7691b29bd29fd9f3f98276034f"
-  integrity sha512-jWL4eh90w0HQOTKP2MoXXUpVxilxsB2Vl4ji69rSjS3EcZ/v4sBmn+A3NpepuJzBhOaEBbR7udonlHHn5DWidg==
+"@babel/plugin-transform-modules-commonjs@^7.23.0":
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.23.0.tgz#b3dba4757133b2762c00f4f94590cf6d52602481"
+  integrity sha512-32Xzss14/UVc7k9g775yMIvkVK8xwKE0DPdP5JTapr3+Z9w4tzeOuLNY6BXDQR6BdnzIlXnCGAzsk/ICHBLVWQ==
   dependencies:
-    "@babel/helper-module-transforms" "^7.22.15"
+    "@babel/helper-module-transforms" "^7.23.0"
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/helper-simple-access" "^7.22.5"
 
-"@babel/plugin-transform-modules-systemjs@^7.22.11":
-  version "7.22.11"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.22.11.tgz#3386be5875d316493b517207e8f1931d93154bb1"
-  integrity sha512-rIqHmHoMEOhI3VkVf5jQ15l539KrwhzqcBO6wdCNWPWc/JWt9ILNYNUssbRpeq0qWns8svuw8LnMNCvWBIJ8wA==
+"@babel/plugin-transform-modules-systemjs@^7.23.0":
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.23.0.tgz#77591e126f3ff4132a40595a6cccd00a6b60d160"
+  integrity sha512-qBej6ctXZD2f+DhlOC9yO47yEYgUh5CZNz/aBoH4j/3NOlRfJXJbY7xDQCqQVf9KbrqGzIWER1f23doHGrIHFg==
   dependencies:
     "@babel/helper-hoist-variables" "^7.22.5"
-    "@babel/helper-module-transforms" "^7.22.9"
+    "@babel/helper-module-transforms" "^7.23.0"
     "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-validator-identifier" "^7.22.5"
+    "@babel/helper-validator-identifier" "^7.22.20"
 
 "@babel/plugin-transform-modules-umd@^7.22.5":
   version "7.22.5"
@@ -717,10 +684,10 @@
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
 
-"@babel/plugin-transform-optional-chaining@^7.22.15":
-  version "7.22.15"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.22.15.tgz#d7a5996c2f7ca4ad2ad16dbb74444e5c4385b1ba"
-  integrity sha512-ngQ2tBhq5vvSJw2Q2Z9i7ealNkpDMU0rGWnHPKqRZO0tzZ5tlaoz4hDvhXioOoaE0X2vfNss1djwg0DXlfu30A==
+"@babel/plugin-transform-optional-chaining@^7.22.15", "@babel/plugin-transform-optional-chaining@^7.23.0":
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.23.0.tgz#73ff5fc1cf98f542f09f29c0631647d8ad0be158"
+  integrity sha512-sBBGXbLJjxTzLBF5rFWaikMnOGOk/BmK6vVByIdEggZ7Vn6CvWXZyRkkLFK6WE0IF8jSliyOkUN6SScFgzCM0g==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
@@ -841,11 +808,11 @@
     "@babel/helper-plugin-utils" "^7.22.5"
 
 "@babel/preset-env@^7.11.0":
-  version "7.22.15"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.22.15.tgz#142716f8e00bc030dae5b2ac6a46fbd8b3e18ff8"
-  integrity sha512-tZFHr54GBkHk6hQuVA8w4Fmq+MSPsfvMG0vPnOYyTnJpyfMqybL8/MbNCPRT9zc2KBO2pe4tq15g6Uno4Jpoag==
+  version "7.23.2"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.23.2.tgz#1f22be0ff0e121113260337dbc3e58fafce8d059"
+  integrity sha512-BW3gsuDD+rvHL2VO2SjAUNTBe5YrjsTiDyqamPDWY723na3/yPQ65X5oQkFVJZ0o50/2d+svm1rkPoJeR1KxVQ==
   dependencies:
-    "@babel/compat-data" "^7.22.9"
+    "@babel/compat-data" "^7.23.2"
     "@babel/helper-compilation-targets" "^7.22.15"
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/helper-validator-option" "^7.22.15"
@@ -871,15 +838,15 @@
     "@babel/plugin-syntax-top-level-await" "^7.14.5"
     "@babel/plugin-syntax-unicode-sets-regex" "^7.18.6"
     "@babel/plugin-transform-arrow-functions" "^7.22.5"
-    "@babel/plugin-transform-async-generator-functions" "^7.22.15"
+    "@babel/plugin-transform-async-generator-functions" "^7.23.2"
     "@babel/plugin-transform-async-to-generator" "^7.22.5"
     "@babel/plugin-transform-block-scoped-functions" "^7.22.5"
-    "@babel/plugin-transform-block-scoping" "^7.22.15"
+    "@babel/plugin-transform-block-scoping" "^7.23.0"
     "@babel/plugin-transform-class-properties" "^7.22.5"
     "@babel/plugin-transform-class-static-block" "^7.22.11"
     "@babel/plugin-transform-classes" "^7.22.15"
     "@babel/plugin-transform-computed-properties" "^7.22.5"
-    "@babel/plugin-transform-destructuring" "^7.22.15"
+    "@babel/plugin-transform-destructuring" "^7.23.0"
     "@babel/plugin-transform-dotall-regex" "^7.22.5"
     "@babel/plugin-transform-duplicate-keys" "^7.22.5"
     "@babel/plugin-transform-dynamic-import" "^7.22.11"
@@ -891,9 +858,9 @@
     "@babel/plugin-transform-literals" "^7.22.5"
     "@babel/plugin-transform-logical-assignment-operators" "^7.22.11"
     "@babel/plugin-transform-member-expression-literals" "^7.22.5"
-    "@babel/plugin-transform-modules-amd" "^7.22.5"
-    "@babel/plugin-transform-modules-commonjs" "^7.22.15"
-    "@babel/plugin-transform-modules-systemjs" "^7.22.11"
+    "@babel/plugin-transform-modules-amd" "^7.23.0"
+    "@babel/plugin-transform-modules-commonjs" "^7.23.0"
+    "@babel/plugin-transform-modules-systemjs" "^7.23.0"
     "@babel/plugin-transform-modules-umd" "^7.22.5"
     "@babel/plugin-transform-named-capturing-groups-regex" "^7.22.5"
     "@babel/plugin-transform-new-target" "^7.22.5"
@@ -902,7 +869,7 @@
     "@babel/plugin-transform-object-rest-spread" "^7.22.15"
     "@babel/plugin-transform-object-super" "^7.22.5"
     "@babel/plugin-transform-optional-catch-binding" "^7.22.11"
-    "@babel/plugin-transform-optional-chaining" "^7.22.15"
+    "@babel/plugin-transform-optional-chaining" "^7.23.0"
     "@babel/plugin-transform-parameters" "^7.22.15"
     "@babel/plugin-transform-private-methods" "^7.22.5"
     "@babel/plugin-transform-private-property-in-object" "^7.22.11"
@@ -919,10 +886,10 @@
     "@babel/plugin-transform-unicode-regex" "^7.22.5"
     "@babel/plugin-transform-unicode-sets-regex" "^7.22.5"
     "@babel/preset-modules" "0.1.6-no-external-plugins"
-    "@babel/types" "^7.22.15"
-    babel-plugin-polyfill-corejs2 "^0.4.5"
-    babel-plugin-polyfill-corejs3 "^0.8.3"
-    babel-plugin-polyfill-regenerator "^0.5.2"
+    "@babel/types" "^7.23.0"
+    babel-plugin-polyfill-corejs2 "^0.4.6"
+    babel-plugin-polyfill-corejs3 "^0.8.5"
+    babel-plugin-polyfill-regenerator "^0.5.3"
     core-js-compat "^3.31.0"
     semver "^6.3.1"
 
@@ -941,9 +908,9 @@
   integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==
 
 "@babel/runtime@^7.11.2", "@babel/runtime@^7.8.4":
-  version "7.22.15"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.22.15.tgz#38f46494ccf6cf020bd4eed7124b425e83e523b8"
-  integrity sha512-T0O+aa+4w0u06iNmapipJXMV4HoUir03hpx3/YqXXhu9xim3w+dVphjFWl1OH8NbZHw5Lbm9k45drDkgq2VNNA==
+  version "7.23.2"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.23.2.tgz#062b0ac103261d68a966c4c7baf2ae3e62ec3885"
+  integrity sha512-mM8eg4yl5D6i3lu2QKPuPH4FArvJ8KhTofbE7jwMUv9KX5mBvwPAqnV3MlyBNqdp9RyRKP6Yck8TrfYrPvX3bg==
   dependencies:
     regenerator-runtime "^0.14.0"
 
@@ -956,7 +923,7 @@
     "@babel/parser" "^7.22.15"
     "@babel/types" "^7.22.15"
 
-"@babel/traverse@^7.22.15":
+"@babel/traverse@^7.23.2":
   version "7.23.2"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.2.tgz#329c7a06735e144a506bdb2cad0268b7f46f4ad8"
   integrity sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==
@@ -972,16 +939,7 @@
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/types@^7.22.10", "@babel/types@^7.22.15", "@babel/types@^7.22.5", "@babel/types@^7.4.4":
-  version "7.22.15"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.22.15.tgz#266cb21d2c5fd0b3931e7a91b6dd72d2f617d282"
-  integrity sha512-X+NLXr0N8XXmN5ZsaQdm9U2SSC3UbIYq/doL++sueHOTisgZHoKaQtZxGuV2cUPQHMfjKEfg/g6oy7Hm6SKFtA==
-  dependencies:
-    "@babel/helper-string-parser" "^7.22.5"
-    "@babel/helper-validator-identifier" "^7.22.15"
-    to-fast-properties "^2.0.0"
-
-"@babel/types@^7.23.0":
+"@babel/types@^7.22.15", "@babel/types@^7.22.19", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.4.4":
   version "7.23.0"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.0.tgz#8c1f020c9df0e737e4e247c0619f58c68458aaeb"
   integrity sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==
@@ -991,9 +949,9 @@
     to-fast-properties "^2.0.0"
 
 "@capacitor/android@^5.0.0":
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/@capacitor/android/-/android-5.3.0.tgz#d6bf2db5f385ac9ec6bc9ccf080c253f3c7b3db8"
-  integrity sha512-5rEwD8u0whGXP+dZ0qXRFP3DWHi4WhZdzcxxZ/D4mLh5eVaQCxPpoHBcrS4FpKtl7PAWNDD2n32D9YrEcfERMA==
+  version "5.5.1"
+  resolved "https://registry.yarnpkg.com/@capacitor/android/-/android-5.5.1.tgz#128dc5ab00f68c80d64ea18e961876b34b4ed859"
+  integrity sha512-WTnPnpaEvTtaEtTNRbh06Y1afF7A4plY/4uajAL0WW8tdR1FxieadF357yKGiAT6CudI/B+eOu6rxn6qWuphKg==
 
 "@capacitor/app@^5.0.0":
   version "5.0.6"
@@ -1019,9 +977,9 @@
     yargs "^17.3.1"
 
 "@capacitor/browser@^5.0.0":
-  version "5.0.6"
-  resolved "https://registry.yarnpkg.com/@capacitor/browser/-/browser-5.0.6.tgz#d936c4951e5a14f3cc841853c3424e29dfa17d88"
-  integrity sha512-wEI7Na6PVzSP/00ud7pjbBwXwVG7HywCdy2fJT/hzF6yuHn4tDirbOvbr1JKd9LZqKs2Xn+TapV38JhBRhX6YA==
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/@capacitor/browser/-/browser-5.1.0.tgz#2389638c09716d815765f9622b5f3c71e21d7b6f"
+  integrity sha512-7togqchk2Tvq4SmLaWhcrd4x48ES/GEZsceM+29aun7WhxQEVcDU0cJsVdSU2LNFwNhWgPV2GW90etVd1B3OdQ==
 
 "@capacitor/camera@^5.0.6":
   version "5.0.7"
@@ -1051,9 +1009,9 @@
     xml2js "^0.4.23"
 
 "@capacitor/cli@^5.0.0":
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/@capacitor/cli/-/cli-5.3.0.tgz#6ee30148a8a6f9317056c8d9d1591ac04783f088"
-  integrity sha512-ku23HPqUHUnSgo/SyEWxVviEAxb4ieWvAVMI3KfrrBoinAhTOvNSZwT346rIpxZ9Xj3Qp41UjdIz0ME+DYwhfA==
+  version "5.5.1"
+  resolved "https://registry.yarnpkg.com/@capacitor/cli/-/cli-5.5.1.tgz#6da1eadea31963b5be64544b88f3e973fe0b1a31"
+  integrity sha512-/oGd2IIc+k1H/fc7tUzP7vqMtZi0gNcJ4/4wUE2kzAnETxxxHXMM/2V62KfjCby/OOAzJbtI7n5OPlnWE9un1A==
   dependencies:
     "@ionic/cli-framework-output" "^2.2.5"
     "@ionic/utils-fs" "^3.1.6"
@@ -1063,7 +1021,7 @@
     debug "^4.3.4"
     env-paths "^2.2.0"
     kleur "^4.1.4"
-    native-run "^1.7.2"
+    native-run "^1.7.3"
     open "^8.4.0"
     plist "^3.0.5"
     prompts "^2.4.2"
@@ -1086,9 +1044,9 @@
     tslib "^2.1.0"
 
 "@capacitor/core@^5.0.0":
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/@capacitor/core/-/core-5.3.0.tgz#07ae34746f1e62ebe6a1078509d29c2465efa445"
-  integrity sha512-mvhh1yJtcUTZ0hUUriBKKpxq47hn75bjxH3tYPRgAFu1z3gowCg+OtG4Rce3W5gr5fSfCjQgOSL0Vp7k9hPUWw==
+  version "5.5.1"
+  resolved "https://registry.yarnpkg.com/@capacitor/core/-/core-5.5.1.tgz#bd2a969a1149a480aed3483d8867677e85606058"
+  integrity sha512-VG6Iv8Q7ZAbvjodxpvjcSe0jfxUwZXnvjbi93ehuJ6eYP8U926qLSXyrT/DToZq+F6v/HyGyVgn3mrE/9jW2Tg==
   dependencies:
     tslib "^2.1.0"
 
@@ -1098,9 +1056,9 @@
   integrity sha512-tmjK0H8IKbDLMcmzZzJPbV+9yLkKJ76QOdz4A7fZAOYx2GnFHsFngxldq/wKotGAJuDX/ih3ZzHNrzVguzlv2g==
 
 "@capacitor/ios@^5.0.0":
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/@capacitor/ios/-/ios-5.3.0.tgz#d2d090fae999d2c0161e72ee55efd8f61e28586d"
-  integrity sha512-AxcW6kp2dOhJ7D6Jz7FAiVi+tq8rv3K3VrfZ0rcGJGlqZfrOJ1m8ImcQ7cO9Fec7wf7a/XSwMOqWemYZFLOO8w==
+  version "5.5.1"
+  resolved "https://registry.yarnpkg.com/@capacitor/ios/-/ios-5.5.1.tgz#e07d0752b8934215a9defc2d22a537060f2dd7f7"
+  integrity sha512-h00qt8u32t8eEbIkuG4IjR0r34YZC0sIXglDH8fRDdA84xDkTybmz3WtdpRWDzh6ukE2RIY7rmD7p410WSJ2yA==
 
 "@capacitor/keyboard@^5.0.0":
   version "5.0.6"
@@ -1247,14 +1205,14 @@
     eslint-visitor-keys "^3.3.0"
 
 "@eslint-community/regexpp@^4.4.0", "@eslint-community/regexpp@^4.6.1":
-  version "4.8.0"
-  resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.8.0.tgz#11195513186f68d42fbf449f9a7136b2c0c92005"
-  integrity sha512-JylOEEzDiOryeUnFbQz+oViCXS0KsvR1mvHkoMiu5+UiBvy+RYX7tzlIIIEstF/gVa2tj9AQXk3dgnxv6KxhFg==
+  version "4.10.0"
+  resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.10.0.tgz#548f6de556857c8bb73bbee70c35dc82a2e74d63"
+  integrity sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==
 
-"@eslint/eslintrc@^2.1.2":
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.2.tgz#c6936b4b328c64496692f76944e755738be62396"
-  integrity sha512-+wvgpDsrB1YqAMdEUCcnTlpfVBH7Vqn6A/NT3D8WVXFIaKMlErPIZT3oCIAVCOtarRpMtelZLqJeU3t7WY6X6g==
+"@eslint/eslintrc@^2.1.3":
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.3.tgz#797470a75fe0fbd5a53350ee715e85e87baff22d"
+  integrity sha512-yZzuIG+jnVu6hNSzFEN07e8BxF3uAzYtQb6uDkaYZLo6oYZDCq454c5kB8zxnzfCYyP4MIuyBn10L0DqwujTmA==
   dependencies:
     ajv "^6.12.4"
     debug "^4.3.2"
@@ -1266,17 +1224,17 @@
     minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
-"@eslint/js@8.48.0":
-  version "8.48.0"
-  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.48.0.tgz#642633964e217905436033a2bd08bf322849b7fb"
-  integrity sha512-ZSjtmelB7IJfWD2Fvb7+Z+ChTIKWq6kjda95fLcQKNS5aheVHn4IkfgRQE3sIIzTcSLwLcLZUD9UBt+V7+h+Pw==
+"@eslint/js@8.53.0":
+  version "8.53.0"
+  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.53.0.tgz#bea56f2ed2b5baea164348ff4d5a879f6f81f20d"
+  integrity sha512-Kn7K8dx/5U6+cT1yEhpX1w4PCSg0M+XyRILPgvwcEBjerFWCwQj5sbr3/VmxqV0JGHCBCzyd6LxypEuehypY1w==
 
-"@humanwhocodes/config-array@^0.11.10":
-  version "0.11.11"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.11.tgz#88a04c570dbbc7dd943e4712429c3df09bc32844"
-  integrity sha512-N2brEuAadi0CcdeMXUkhbZB84eskAc8MEX1By6qEchoVywSgXPIjou4rYsl0V3Hj0ZnuGycGCjdNgockbzeWNA==
+"@humanwhocodes/config-array@^0.11.13":
+  version "0.11.13"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.13.tgz#075dc9684f40a531d9b26b0822153c1e832ee297"
+  integrity sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ==
   dependencies:
-    "@humanwhocodes/object-schema" "^1.2.1"
+    "@humanwhocodes/object-schema" "^2.0.1"
     debug "^4.1.1"
     minimatch "^3.0.5"
 
@@ -1285,10 +1243,10 @@
   resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c"
   integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==
 
-"@humanwhocodes/object-schema@^1.2.1":
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
-  integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
+"@humanwhocodes/object-schema@^2.0.1":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.1.tgz#e5211452df060fa8522b55c7b3c0c4d1981cb044"
+  integrity sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==
 
 "@hutson/parse-repository-url@^3.0.0":
   version "3.0.2"
@@ -1312,7 +1270,7 @@
     debug "^4.0.0"
     tslib "^2.0.1"
 
-"@ionic/utils-fs@3.1.7", "@ionic/utils-fs@^3.1.5", "@ionic/utils-fs@^3.1.6":
+"@ionic/utils-fs@3.1.7", "@ionic/utils-fs@^3.1.5", "@ionic/utils-fs@^3.1.6", "@ionic/utils-fs@^3.1.7":
   version "3.1.7"
   resolved "https://registry.yarnpkg.com/@ionic/utils-fs/-/utils-fs-3.1.7.tgz#e0d41225272c346846867e88a0b84b1a4ee9d9c9"
   integrity sha512-2EknRvMVfhnyhL1VhFkSLa5gOcycK91VnjfrTB0kbqkTFCOXyXgVLI5whzq7SLrgD9t1aqos3lMMQyVzaQ5gVA==
@@ -1364,7 +1322,7 @@
     debug "^4.0.0"
     tslib "^2.0.1"
 
-"@ionic/utils-terminal@2.3.4", "@ionic/utils-terminal@^2.3.0", "@ionic/utils-terminal@^2.3.3":
+"@ionic/utils-terminal@2.3.4", "@ionic/utils-terminal@^2.3.0", "@ionic/utils-terminal@^2.3.3", "@ionic/utils-terminal@^2.3.4":
   version "2.3.4"
   resolved "https://registry.yarnpkg.com/@ionic/utils-terminal/-/utils-terminal-2.3.4.tgz#e40c44b676265ed6a07a68407bda6e135870f879"
   integrity sha512-cEiMFl3jklE0sW60r8JHH3ijFTwh/jkdEKWbylSyExQwZ8pPuwoXz7gpkWoJRLuoRHHSvg+wzNYyPJazIHfoJA==
@@ -1427,9 +1385,9 @@
     "@jridgewell/sourcemap-codec" "^1.4.10"
 
 "@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.9":
-  version "0.3.19"
-  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.19.tgz#f8a3249862f91be48d3127c3cfe992f79b4b8811"
-  integrity sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw==
+  version "0.3.20"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.20.tgz#72e45707cf240fa6b081d0366f8265b0cd10197f"
+  integrity sha512-R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q==
   dependencies:
     "@jridgewell/resolve-uri" "^3.1.0"
     "@jridgewell/sourcemap-codec" "^1.4.14"
@@ -1473,14 +1431,11 @@
     fastq "^1.6.0"
 
 "@playwright/test@^1.20.1":
-  version "1.37.1"
-  resolved "https://registry.yarnpkg.com/@playwright/test/-/test-1.37.1.tgz#e7f44ae0faf1be52d6360c6bbf689fd0057d9b6f"
-  integrity sha512-bq9zTli3vWJo8S3LwB91U0qDNQDpEXnw7knhxLM0nwDvexQAwx9tO8iKDZSqqneVq+URd/WIoz+BALMqUTgdSg==
+  version "1.39.0"
+  resolved "https://registry.yarnpkg.com/@playwright/test/-/test-1.39.0.tgz#d10ba8e38e44104499e25001945f07faa9fa91cd"
+  integrity sha512-3u1iFqgzl7zr004bGPYiN/5EZpRUSFddQBra8Rqll5N0/vfpqlP9I9EXqAoGacuAbX6c9Ulg/Cjqglp5VkK6UQ==
   dependencies:
-    "@types/node" "*"
-    playwright-core "1.37.1"
-  optionalDependencies:
-    fsevents "2.3.2"
+    playwright "1.39.0"
 
 "@prettier/plugin-xml@^2.2.0":
   version "2.2.0"
@@ -1640,28 +1595,28 @@
   integrity sha512-Xn8k62yJrTGleinKIIlasl7IuMWzt933qA0r/9qh8s7aoIzXkX6hQ31r0glpe7dy6ytKEEwua1TrT6ZCK5rmsg==
 
 "@types/chai-subset@^1.3.3":
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/@types/chai-subset/-/chai-subset-1.3.3.tgz#97893814e92abd2c534de422cb377e0e0bdaac94"
-  integrity sha512-frBecisrNGz+F4T6bcc+NLeolfiojh5FxW2klu669+8BARtyQv2C/GkNW6FUodVe4BroGMP/wER/YDGc7rEllw==
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/@types/chai-subset/-/chai-subset-1.3.4.tgz#7938fa929dd12db451457e4d6faa27bcd599a729"
+  integrity sha512-CCWNXrJYSUIojZ1149ksLl3AN9cmZ5djf+yUoVVV+NuYrtydItQVlL2ZDqyC6M6O9LWRnVf8yYDxbXHO2TfQZg==
   dependencies:
     "@types/chai" "*"
 
 "@types/chai@*", "@types/chai@^4.3.5":
-  version "4.3.6"
-  resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.3.6.tgz#7b489e8baf393d5dd1266fb203ddd4ea941259e6"
-  integrity sha512-VOVRLM1mBxIRxydiViqPcKn6MIxZytrbMpd6RJLIWKxUNr3zux8no0Oc7kJx0WAPIitgZ0gkrDS+btlqQpubpw==
+  version "4.3.9"
+  resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.3.9.tgz#144d762491967db8c6dea38e03d2206c2623feec"
+  integrity sha512-69TtiDzu0bcmKQv3yg1Zx409/Kd7r0b5F1PfpYJfSHzLGtB53547V4u+9iqKYsTu/O2ai6KTb0TInNpvuQ3qmg==
 
 "@types/cross-spawn@^6.0.2":
-  version "6.0.3"
-  resolved "https://registry.yarnpkg.com/@types/cross-spawn/-/cross-spawn-6.0.3.tgz#c743cb2608f55860ee9776d8c99135d6032c763c"
-  integrity sha512-BDAkU7WHHRHnvBf5z89lcvACsvkz/n7Tv+HyD/uW76O29HoH1Tk/W6iQrepaZVbisvlEek4ygwT8IW7ow9XLAA==
+  version "6.0.4"
+  resolved "https://registry.yarnpkg.com/@types/cross-spawn/-/cross-spawn-6.0.4.tgz#e658d29e2308a01f48b7b30fd8cdf07aeb2e5a82"
+  integrity sha512-GGLpeThc2Bu8FBGmVn76ZU3lix17qZensEI4/MPty0aZpm2CHfgEMis31pf5X5EiudYKcPAsWciAsCALoPo5dw==
   dependencies:
     "@types/node" "*"
 
 "@types/diff@^5.0.2":
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/@types/diff/-/diff-5.0.3.tgz#1f89e49ff83b5d200d78964fb896c68498ce1828"
-  integrity sha512-amrLbRqTU9bXMCc6uX0sWpxsQzRIo9z6MJPkH1pkez/qOxuqSZVuryJAWoBRq94CeG8JxY+VK4Le9HtjQR5T9A==
+  version "5.0.7"
+  resolved "https://registry.yarnpkg.com/@types/diff/-/diff-5.0.7.tgz#471bad8be0d911ed04d115863402920f3a84079c"
+  integrity sha512-adBosR2GntaQQiuHnfRN9HtxYpoHHJBcdyz7VSXhjpSAmtvIfu/S1fjTqwuIx/Ypba6LCZdfWIqPYx2BR5TneQ==
 
 "@types/estree@0.0.39":
   version "0.0.39"
@@ -1669,9 +1624,9 @@
   integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==
 
 "@types/fs-extra@^8.0.0":
-  version "8.1.2"
-  resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-8.1.2.tgz#7125cc2e4bdd9bd2fc83005ffdb1d0ba00cca61f"
-  integrity sha512-SvSrYXfWSc7R4eqnOzbQF4TZmfpNSM9FrSWLU3EUnWBuyZqNBOrv1B1JA3byUDPUl9z4Ab3jeZG2eDdySlgNMg==
+  version "8.1.4"
+  resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-8.1.4.tgz#8171df1d16a80d69fc9c3aab07d7961349a5cb8b"
+  integrity sha512-OMcQKnlrkrOI0TaZ/MgVDA8LYFl7CykzFsjMj9l5x3un2nFxCY20ZFlnqrM0lcqlbs0Yro2HbnZlmopyRaoJ5w==
   dependencies:
     "@types/node" "*"
 
@@ -1683,14 +1638,14 @@
     "@types/node" "*"
 
 "@types/hammerjs@^2.0.42":
-  version "2.0.42"
-  resolved "https://registry.yarnpkg.com/@types/hammerjs/-/hammerjs-2.0.42.tgz#d7a53edbc51b2c13a9a759c45d7b5e61243d7dba"
-  integrity sha512-Xxk14BrwHnGi0xlURPRb+Y0UNn2w3cTkeFm7pKMsYOaNgH/kabbJLhcBoNIodwsbTz7Z8KcWjtDvlGH0nc0U9w==
+  version "2.0.43"
+  resolved "https://registry.yarnpkg.com/@types/hammerjs/-/hammerjs-2.0.43.tgz#8660dd1e0e5fd979395e2f999e670cdb9484d1e9"
+  integrity sha512-wqxfwHk83RS7+6OpytGdo5wqkqtvx+bGaIs1Rwm5NrtQHUfL4OgWs/5p0OipmjmT+fexePh37Ek+mqIpdNjQKA==
 
 "@types/ini@^1.3.31":
-  version "1.3.31"
-  resolved "https://registry.yarnpkg.com/@types/ini/-/ini-1.3.31.tgz#c78541a187bd88d5c73e990711c9d85214800d1b"
-  integrity sha512-8ecxxaG4AlVEM1k9+BsziMw8UsX0qy3jYI1ad/71RrDZ+rdL6aZB0wLfAuflQiDhkD5o4yJ0uPK3OSUic3fG0w==
+  version "1.3.32"
+  resolved "https://registry.yarnpkg.com/@types/ini/-/ini-1.3.32.tgz#6ebf95923d3b5afb95bfcf76a246da9fed26e48b"
+  integrity sha512-cCXfrhgTiChyYIBs7ZZdsi8a9JLs4vVdCsUJt8nczxpNcHcUEMO8Tu5vsMwbepDobKC1mOf4w32jgOz1NEDoaA==
 
 "@types/jest@^27.0.2":
   version "27.5.2"
@@ -1701,39 +1656,41 @@
     pretty-format "^27.0.0"
 
 "@types/json-schema@^7.0.9":
-  version "7.0.12"
-  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.12.tgz#d70faba7039d5fca54c83c7dbab41051d2b6f6cb"
-  integrity sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==
+  version "7.0.14"
+  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.14.tgz#74a97a5573980802f32c8e47b663530ab3b6b7d1"
+  integrity sha512-U3PUjAudAdJBeC2pgN8uTIKgxrb4nlDF3SF0++EldXQvQBGkpFZMSnwQiIoDU77tv45VgNkl/L4ouD+rEomujw==
 
 "@types/lodash@^4.14.175":
-  version "4.14.197"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.197.tgz#e95c5ddcc814ec3e84c891910a01e0c8a378c54b"
-  integrity sha512-BMVOiWs0uNxHVlHBgzTIqJYmj+PgCo4euloGF+5m4okL3rEYzM2EEv78mw8zWSMM57dM7kVIgJ2QDvwHSoCI5g==
+  version "4.14.200"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.200.tgz#435b6035c7eba9cdf1e039af8212c9e9281e7149"
+  integrity sha512-YI/M/4HRImtNf3pJgbF+W6FrXovqj+T+/HpENLTooK9PnkacBsDpeP3IpHab40CClUfhNmdM2WTNP2sa2dni5Q==
 
 "@types/marked@^4.0.7":
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/@types/marked/-/marked-4.3.1.tgz#45fb6dfd47afb595766c71ed7749ead23f137de3"
-  integrity sha512-vSSbKZFbNktrQ15v7o1EaH78EbWV+sPQbPjHG+Cp8CaNcPFUEfjZ0Iml/V0bFDwsTlYe8o6XC5Hfdp91cqPV2g==
+  version "4.3.2"
+  resolved "https://registry.yarnpkg.com/@types/marked/-/marked-4.3.2.tgz#e2e0ad02ebf5626bd215c5bae2aff6aff0ce9eac"
+  integrity sha512-a79Yc3TOk6dGdituy8hmTTJXjOkZ7zsFYV10L337ttq/rec8lRMDBpV7fL3uLx6TgbFCa5DU/h8FmIBQPSbU0w==
 
 "@types/minimist@^1.2.0":
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.2.tgz#ee771e2ba4b3dc5b372935d549fd9617bf345b8c"
-  integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.4.tgz#81f886786411c45bba3f33e781ab48bd56bfca2e"
+  integrity sha512-Kfe/D3hxHTusnPNRbycJE1N77WHDsdS4AjUYIzlDzhDrS47NrwuL3YW4VITxwR7KCVpzwgy4Rbj829KSSQmwXQ==
 
 "@types/node@*":
-  version "20.5.9"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.5.9.tgz#a70ec9d8fa0180a314c3ede0e20ea56ff71aed9a"
-  integrity sha512-PcGNd//40kHAS3sTlzKB9C9XL4K0sTup8nbG5lC14kzEteTNuAFh9u5nA0o5TWnSG2r/JNPRXFVcHJIIeRlmqQ==
+  version "20.8.10"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.8.10.tgz#a5448b895c753ae929c26ce85cab557c6d4a365e"
+  integrity sha512-TlgT8JntpcbmKUFzjhsyhGfP2fsiz1Mv56im6enJ905xG1DAYesxJaeSbGqQmAw8OWPdhyJGhGSQGKRNJ45u9w==
+  dependencies:
+    undici-types "~5.26.4"
 
 "@types/normalize-package-data@^2.4.0":
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz#d3357479a0fdfdd5907fe67e17e0a85c906e1301"
-  integrity sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==
+  version "2.4.3"
+  resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.3.tgz#291c243e4b94dbfbc0c0ee26b7666f1d5c030e2c"
+  integrity sha512-ehPtgRgaULsFG8x0NeYJvmyH1hmlfsNLujHe9dQEia/7MAJYdzMSi19JtchUHjmBA6XC/75dK55mzZH+RyieSg==
 
 "@types/plist@^3.0.2":
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/@types/plist/-/plist-3.0.2.tgz#61b3727bba0f5c462fe333542534a0c3e19ccb01"
-  integrity sha512-ULqvZNGMv0zRFvqn8/4LSPtnmN4MfhlPNtJCTpKuIIxGVGZ2rYWzFXrvEBoh9CVyqSE7D6YFRJ1hydLHI6kbWw==
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/@types/plist/-/plist-3.0.4.tgz#af0c5ffaf30d2302460adc17861021323c1410f9"
+  integrity sha512-pTa9xUFQFM9WJGSWHajYNljD+DbVylE1q9IweK1LBhUYJdJ28YNU8j3KZ4Q1Qw+cSl4+QLLLOVmqNjhhvVO8fA==
   dependencies:
     "@types/node" "*"
     xmlbuilder ">=11.0.1"
@@ -1746,9 +1703,9 @@
     "@types/node" "*"
 
 "@types/semver@^7.3.12":
-  version "7.5.1"
-  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.1.tgz#0480eeb7221eb9bc398ad7432c9d7e14b1a5a367"
-  integrity sha512-cJRQXpObxfNKkFAZbJl2yjWtJCqELQIdShsogr1d2MilP8dKD9TE/nEKHkJgUNHdGKCQaf9HbIynuV2csLGVLg==
+  version "7.5.4"
+  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.4.tgz#0a41252ad431c473158b22f9bfb9a63df7541cff"
+  integrity sha512-MMzuxN3GdFwskAnb6fz0orFvhfqi752yjaXylr0Rp4oDg5H0Zn1IuyRhDVvYOwAXoJirx2xuS16I3WjxnAIHiQ==
 
 "@types/slice-ansi@^4.0.0":
   version "4.0.0"
@@ -1756,14 +1713,14 @@
   integrity sha512-+OpjSaq85gvlZAYINyzKpLeiFkSC4EsC6IIiT6v6TLSU5k5U83fHGj9Lel8oKEXM0HqgrMVCjXPDPVICtxF7EQ==
 
 "@types/slice-ansi@^5.0.0":
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/@types/slice-ansi/-/slice-ansi-5.0.0.tgz#2d836ce48f14960a71226d8472f2344760b279df"
-  integrity sha512-Bt9wdwNObyD9EQMNN2GSeutWmpsZUC1/bip6XKawJ+cAK9Vhf2EwnSgg7G9Zd7KJv0fTvEbgHFjrHnImemyYQg==
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/@types/slice-ansi/-/slice-ansi-5.0.1.tgz#1593be2f6a7b09561de377e0e6f4728e314aa792"
+  integrity sha512-GEwprZg+tEst3Zd0wJChmew9mjbpCqOR1sR0CZ1Ht3XZYijJ2xoHHp8nLmjuF1Sldsj4S/1wDr3ey8eopRdgeA==
 
 "@types/trusted-types@^2.0.2":
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/@types/trusted-types/-/trusted-types-2.0.3.tgz#a136f83b0758698df454e328759dbd3d44555311"
-  integrity sha512-NfQ4gyz38SL8sDNrSixxU2Os1a5xcdFxipAFxYEuLUlvU2uDwS4NUpsImcf1//SlWItCVMMLiylsxbmNMToV/g==
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/@types/trusted-types/-/trusted-types-2.0.5.tgz#5cac7e7df3275bb95f79594f192d97da3b4fd5fe"
+  integrity sha512-I3pkr8j/6tmQtKV/ZzHtuaqYSQvyjGRKH4go60Rr0IDLlFxuRT5V32uvB1mecM5G1EVAUyF/4r4QZ1GHgz+mxA==
 
 "@types/xterm@^3.0.0":
   version "3.0.0"
@@ -1856,44 +1813,49 @@
     "@typescript-eslint/types" "5.62.0"
     eslint-visitor-keys "^3.3.0"
 
-"@vitest/expect@0.34.3":
-  version "0.34.3"
-  resolved "https://registry.yarnpkg.com/@vitest/expect/-/expect-0.34.3.tgz#576e1fd6a3a8b8b7a79a06477f3d450a77d67852"
-  integrity sha512-F8MTXZUYRBVsYL1uoIft1HHWhwDbSzwAU9Zgh8S6WFC3YgVb4AnFV2GXO3P5Em8FjEYaZtTnQYoNwwBrlOMXgg==
+"@ungap/structured-clone@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406"
+  integrity sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==
+
+"@vitest/expect@0.34.6":
+  version "0.34.6"
+  resolved "https://registry.yarnpkg.com/@vitest/expect/-/expect-0.34.6.tgz#608a7b7a9aa3de0919db99b4cc087340a03ea77e"
+  integrity sha512-QUzKpUQRc1qC7qdGo7rMK3AkETI7w18gTCUrsNnyjjJKYiuUB9+TQK3QnR1unhCnWRC0AbKv2omLGQDF/mIjOw==
   dependencies:
-    "@vitest/spy" "0.34.3"
-    "@vitest/utils" "0.34.3"
-    chai "^4.3.7"
+    "@vitest/spy" "0.34.6"
+    "@vitest/utils" "0.34.6"
+    chai "^4.3.10"
 
-"@vitest/runner@0.34.3":
-  version "0.34.3"
-  resolved "https://registry.yarnpkg.com/@vitest/runner/-/runner-0.34.3.tgz#ce09b777d133bbcf843e1a67f4a743365764e097"
-  integrity sha512-lYNq7N3vR57VMKMPLVvmJoiN4bqwzZ1euTW+XXYH5kzr3W/+xQG3b41xJn9ChJ3AhYOSoweu974S1V3qDcFESA==
+"@vitest/runner@0.34.6":
+  version "0.34.6"
+  resolved "https://registry.yarnpkg.com/@vitest/runner/-/runner-0.34.6.tgz#6f43ca241fc96b2edf230db58bcde5b974b8dcaf"
+  integrity sha512-1CUQgtJSLF47NnhN+F9X2ycxUP0kLHQ/JWvNHbeBfwW8CzEGgeskzNnHDyv1ieKTltuR6sdIHV+nmR6kPxQqzQ==
   dependencies:
-    "@vitest/utils" "0.34.3"
+    "@vitest/utils" "0.34.6"
     p-limit "^4.0.0"
     pathe "^1.1.1"
 
-"@vitest/snapshot@0.34.3":
-  version "0.34.3"
-  resolved "https://registry.yarnpkg.com/@vitest/snapshot/-/snapshot-0.34.3.tgz#cb4767aa44711a1072bd2e06204b659275c4f0f2"
-  integrity sha512-QyPaE15DQwbnIBp/yNJ8lbvXTZxS00kRly0kfFgAD5EYmCbYcA+1EEyRalc93M0gosL/xHeg3lKAClIXYpmUiQ==
+"@vitest/snapshot@0.34.6":
+  version "0.34.6"
+  resolved "https://registry.yarnpkg.com/@vitest/snapshot/-/snapshot-0.34.6.tgz#b4528cf683b60a3e8071cacbcb97d18b9d5e1d8b"
+  integrity sha512-B3OZqYn6k4VaN011D+ve+AA4whM4QkcwcrwaKwAbyyvS/NB1hCWjFIBQxAQQSQir9/RtyAAGuq+4RJmbn2dH4w==
   dependencies:
     magic-string "^0.30.1"
     pathe "^1.1.1"
     pretty-format "^29.5.0"
 
-"@vitest/spy@0.34.3":
-  version "0.34.3"
-  resolved "https://registry.yarnpkg.com/@vitest/spy/-/spy-0.34.3.tgz#d4cf25e6ca9230991a0223ecd4ec2df30f0784ff"
-  integrity sha512-N1V0RFQ6AI7CPgzBq9kzjRdPIgThC340DGjdKdPSE8r86aUSmeliTUgkTqLSgtEwWWsGfBQ+UetZWhK0BgJmkQ==
+"@vitest/spy@0.34.6":
+  version "0.34.6"
+  resolved "https://registry.yarnpkg.com/@vitest/spy/-/spy-0.34.6.tgz#b5e8642a84aad12896c915bce9b3cc8cdaf821df"
+  integrity sha512-xaCvneSaeBw/cz8ySmF7ZwGvL0lBjfvqc1LpQ/vcdHEvpLn3Ff1vAvjw+CoGn0802l++5L/pxb7whwcWAw+DUQ==
   dependencies:
     tinyspy "^2.1.1"
 
-"@vitest/utils@0.34.3":
-  version "0.34.3"
-  resolved "https://registry.yarnpkg.com/@vitest/utils/-/utils-0.34.3.tgz#6e243189a358b736b9fc0216e6b6979bc857e897"
-  integrity sha512-kiSnzLG6m/tiT0XEl4U2H8JDBjFtwVlaE8I3QfGiMFR0QvnRDfYfdP3YvTBWM/6iJDAyaPY6yVQiCTUc7ZzTHA==
+"@vitest/utils@0.34.6":
+  version "0.34.6"
+  resolved "https://registry.yarnpkg.com/@vitest/utils/-/utils-0.34.6.tgz#38a0a7eedddb8e7291af09a2409cb8a189516968"
+  integrity sha512-IG5aDD8S6zlvloDsnzHw0Ut5xczlF+kv2BOTo+iXfPr54Yhi5qbVOgGB1hZaVq4iJ4C/MZ2J0y15IlsV/ZcI0A==
   dependencies:
     diff-sequences "^29.4.3"
     loupe "^2.3.6"
@@ -1953,9 +1915,9 @@ acorn-walk@^7.1.1:
   integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==
 
 acorn-walk@^8.1.1, acorn-walk@^8.2.0:
-  version "8.2.0"
-  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1"
-  integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==
+  version "8.3.0"
+  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.3.0.tgz#2097665af50fd0cf7a2dfccd2b9368964e66540f"
+  integrity sha512-FS7hV565M5l1R08MXqo8odwMTB02C2UqzB17RVgu9EyuYFBqJZ3/ZY97sQD5FewVu1UyDFc1yztUDrAwT0EypA==
 
 acorn@^7.1.1:
   version "7.4.1"
@@ -1963,9 +1925,9 @@ acorn@^7.1.1:
   integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
 
 acorn@^8.10.0, acorn@^8.4.1, acorn@^8.5.0, acorn@^8.8.2, acorn@^8.9.0:
-  version "8.10.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.10.0.tgz#8be5b3907a67221a81ab23c7889c4c5526b62ec5"
-  integrity sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==
+  version "8.11.2"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.2.tgz#ca0d78b51895be5390a5903c5b3bdcdaf78ae40b"
+  integrity sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==
 
 add-stream@^1.0.0:
   version "1.0.0"
@@ -2067,14 +2029,15 @@ array-union@^2.1.0:
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
   integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
 
-arraybuffer.prototype.slice@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.1.tgz#9b5ea3868a6eebc30273da577eb888381c0044bb"
-  integrity sha512-09x0ZWFEjj4WD8PDbykUwo3t9arLn8NIzmmYEJFpYekOAQjpkGSyrQhNoRTcwwcFRu+ycWF78QZ63oWTqSjBcw==
+arraybuffer.prototype.slice@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.2.tgz#98bd561953e3e74bb34938e77647179dfe6e9f12"
+  integrity sha512-yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw==
   dependencies:
     array-buffer-byte-length "^1.0.0"
     call-bind "^1.0.2"
     define-properties "^1.2.0"
+    es-abstract "^1.22.1"
     get-intrinsic "^1.2.1"
     is-array-buffer "^3.0.2"
     is-shared-array-buffer "^1.0.2"
@@ -2100,9 +2063,9 @@ async@0.1.x:
   integrity sha512-2tEzliJmf5fHNafNwQLJXUasGzQCVctvsNkXmnlELHwypU0p08/rHohYvkqKIjyXpx+0rkrYv6QbhJ+UF4QkBg==
 
 async@^3.2.3:
-  version "3.2.4"
-  resolved "https://registry.yarnpkg.com/async/-/async-3.2.4.tgz#2d22e00f8cddeb5fde5dd33522b56d1cf569a81c"
-  integrity sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==
+  version "3.2.5"
+  resolved "https://registry.yarnpkg.com/async/-/async-3.2.5.tgz#ebd52a8fdaf7a2289a24df399f8d8485c8a46b66"
+  integrity sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg==
 
 asynckit@^0.4.0:
   version "0.4.0"
@@ -2119,29 +2082,29 @@ available-typed-arrays@^1.0.5:
   resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7"
   integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==
 
-babel-plugin-polyfill-corejs2@^0.4.5:
-  version "0.4.5"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.5.tgz#8097b4cb4af5b64a1d11332b6fb72ef5e64a054c"
-  integrity sha512-19hwUH5FKl49JEsvyTcoHakh6BE0wgXLLptIyKZ3PijHc/Ci521wygORCUCCred+E/twuqRyAkE02BAWPmsHOg==
+babel-plugin-polyfill-corejs2@^0.4.6:
+  version "0.4.6"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.6.tgz#b2df0251d8e99f229a8e60fc4efa9a68b41c8313"
+  integrity sha512-jhHiWVZIlnPbEUKSSNb9YoWcQGdlTLq7z1GHL4AjFxaoOUMuuEVJ+Y4pAaQUGOGk93YsVCKPbqbfw3m0SM6H8Q==
   dependencies:
     "@babel/compat-data" "^7.22.6"
-    "@babel/helper-define-polyfill-provider" "^0.4.2"
+    "@babel/helper-define-polyfill-provider" "^0.4.3"
     semver "^6.3.1"
 
-babel-plugin-polyfill-corejs3@^0.8.3:
-  version "0.8.3"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.3.tgz#b4f719d0ad9bb8e0c23e3e630c0c8ec6dd7a1c52"
-  integrity sha512-z41XaniZL26WLrvjy7soabMXrfPWARN25PZoriDEiLMxAp50AUW3t35BGQUMg5xK3UrpVTtagIDklxYa+MhiNA==
+babel-plugin-polyfill-corejs3@^0.8.5:
+  version "0.8.6"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.6.tgz#25c2d20002da91fe328ff89095c85a391d6856cf"
+  integrity sha512-leDIc4l4tUgU7str5BWLS2h8q2N4Nf6lGZP6UrNDxdtfF2g69eJ5L0H7S8A5Ln/arfFAfHor5InAdZuIOwZdgQ==
   dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.4.2"
-    core-js-compat "^3.31.0"
+    "@babel/helper-define-polyfill-provider" "^0.4.3"
+    core-js-compat "^3.33.1"
 
-babel-plugin-polyfill-regenerator@^0.5.2:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.2.tgz#80d0f3e1098c080c8b5a65f41e9427af692dc326"
-  integrity sha512-tAlOptU0Xj34V1Y2PNTL4Y0FOJMDB6bZmoW39FeCQIhigGLkqu3Fj6uiXpxIf6Ij274ENdYx64y6Au+ZKlb1IA==
+babel-plugin-polyfill-regenerator@^0.5.3:
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.3.tgz#d4c49e4b44614607c13fb769bcd85c72bb26a4a5"
+  integrity sha512-8sHeDOmXC8csczMrYEOf0UTNa4yE2SxV5JGeT/LP1n0OYVDUUFPxG9vdk2AlDlIit4t+Kf0xCtpgXPBwnn/9pw==
   dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.4.2"
+    "@babel/helper-define-polyfill-provider" "^0.4.3"
 
 balanced-match@^1.0.0:
   version "1.0.2"
@@ -2225,15 +2188,15 @@ browser-process-hrtime@^1.0.0:
   resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626"
   integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==
 
-browserslist@^4.21.10, browserslist@^4.21.9:
-  version "4.21.10"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.10.tgz#dbbac576628c13d3b2231332cb2ec5a46e015bb0"
-  integrity sha512-bipEBdZfVH5/pwrvqc+Ub0kUPVfGUhlKxbvfD+z1BDnPEO/X98ruXGA1WP5ASpAFKan7Qr6j736IacbZQuAlKQ==
+browserslist@^4.21.9, browserslist@^4.22.1:
+  version "4.22.1"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.22.1.tgz#ba91958d1a59b87dab6fed8dfbcb3da5e2e9c619"
+  integrity sha512-FEVc202+2iuClEhZhrWy6ZiAcRLvNMyYcxZ8raemul1DYVOVdFsbqckWLdsixQZCpJlwe77Z3UTalE7jsjnKfQ==
   dependencies:
-    caniuse-lite "^1.0.30001517"
-    electron-to-chromium "^1.4.477"
+    caniuse-lite "^1.0.30001541"
+    electron-to-chromium "^1.4.535"
     node-releases "^2.0.13"
-    update-browserslist-db "^1.0.11"
+    update-browserslist-db "^1.0.13"
 
 buffer-crc32@~0.2.3:
   version "0.2.13"
@@ -2263,13 +2226,14 @@ cac@^6.7.14:
   resolved "https://registry.yarnpkg.com/cac/-/cac-6.7.14.tgz#804e1e6f506ee363cb0e3ccbb09cad5dd9870959"
   integrity sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==
 
-call-bind@^1.0.0, call-bind@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"
-  integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==
+call-bind@^1.0.0, call-bind@^1.0.2, call-bind@^1.0.4, call-bind@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.5.tgz#6fa2b7845ce0ea49bf4d8b9ef64727a2c2e2e513"
+  integrity sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==
   dependencies:
-    function-bind "^1.1.1"
-    get-intrinsic "^1.0.2"
+    function-bind "^1.1.2"
+    get-intrinsic "^1.2.1"
+    set-function-length "^1.1.1"
 
 callsites@^3.0.0:
   version "3.1.0"
@@ -2290,10 +2254,10 @@ camelcase@^5.0.0, camelcase@^5.3.1:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
-caniuse-lite@^1.0.30001517:
-  version "1.0.30001527"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001527.tgz#813826554828245ccee776c850566dce12bdeaba"
-  integrity sha512-YkJi7RwPgWtXVSgK4lG9AHH57nSzvvOp9MesgXmw4Q7n0C3H04L0foHqfxcmSAm5AcWb8dW9AYj2tR7/5GnddQ==
+caniuse-lite@^1.0.30001541:
+  version "1.0.30001561"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001561.tgz#752f21f56f96f1b1a52e97aae98c57c562d5d9da"
+  integrity sha512-NTt0DNoKe958Q0BE0j0c1V9jbUzhBxHIEJy7asmGrpE0yG63KTV7PLHPnK2E1O9RsQrQ081I3NLuXGS6zht3cw==
 
 capacitor-native-biometric@^4.1.3:
   version "4.2.2"
@@ -2314,18 +2278,18 @@ capacitor-ssh-plugin@^0.5.0:
   dependencies:
     wd "^0.0.26"
 
-chai@^4.3.7:
-  version "4.3.8"
-  resolved "https://registry.yarnpkg.com/chai/-/chai-4.3.8.tgz#40c59718ad6928da6629c70496fe990b2bb5b17c"
-  integrity sha512-vX4YvVVtxlfSZ2VecZgFUTU5qPCYsobVI2O9FmwEXBhDigYGQA6jRXCycIs1yJnnWbZ6/+a2zNIF5DfVCcJBFQ==
+chai@^4.3.10:
+  version "4.3.10"
+  resolved "https://registry.yarnpkg.com/chai/-/chai-4.3.10.tgz#d784cec635e3b7e2ffb66446a63b4e33bd390384"
+  integrity sha512-0UXG04VuVbruMUYbJ6JctvH0YnC/4q3/AkT18q4NaITo91CUm0liMS9VqzT9vZhVQ/1eqPanMWjBM+Juhfb/9g==
   dependencies:
     assertion-error "^1.1.0"
-    check-error "^1.0.2"
-    deep-eql "^4.1.2"
-    get-func-name "^2.0.0"
-    loupe "^2.3.1"
+    check-error "^1.0.3"
+    deep-eql "^4.1.3"
+    get-func-name "^2.0.2"
+    loupe "^2.3.6"
     pathval "^1.1.1"
-    type-detect "^4.0.5"
+    type-detect "^4.0.8"
 
 chalk@2.4.2, chalk@^2.4.2:
   version "2.4.2"
@@ -2344,10 +2308,12 @@ chalk@^4.0.0, chalk@^4.0.2:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
-check-error@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82"
-  integrity sha512-BrgHpW9NURQgzoNyjfq0Wu6VFO6D7IZEmJNdtgNqpzGG8RuNFHt2jQxWlAs4HMe119chBnv+34syEZtc6IhLtA==
+check-error@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.3.tgz#a6502e4312a7ee969f646e83bb3ddd56281bd694"
+  integrity sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==
+  dependencies:
+    get-func-name "^2.0.2"
 
 chevrotain@7.1.1:
   version "7.1.1"
@@ -2642,17 +2608,17 @@ conventional-commits-parser@^3.2.0:
     split2 "^3.0.0"
     through2 "^4.0.0"
 
-convert-source-map@^1.7.0:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f"
-  integrity sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==
+convert-source-map@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-2.0.0.tgz#4b560f649fc4e918dd0ab75cf4961e8bc882d82a"
+  integrity sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==
 
-core-js-compat@^3.31.0:
-  version "3.32.1"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.32.1.tgz#55f9a7d297c0761a8eb1d31b593e0f5b6ffae964"
-  integrity sha512-GSvKDv4wE0bPnQtjklV101juQ85g6H3rm5PDP20mqlS5j0kXF3pP97YvAu5hl+uFHqMictp3b2VxOHljWMAtuA==
+core-js-compat@^3.31.0, core-js-compat@^3.33.1:
+  version "3.33.2"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.33.2.tgz#3ea4563bfd015ad4e4b52442865b02c62aba5085"
+  integrity sha512-axfo+wxFVxnqf8RvxTzoAlzW4gRoacrHeoFlc9n0x50+7BEyZL/Rt3hicaED1/CEd7I6tPCPVUYcJwCMO5XUYw==
   dependencies:
-    browserslist "^4.21.10"
+    browserslist "^4.22.1"
 
 core-util-is@~1.0.0:
   version "1.0.3"
@@ -2781,7 +2747,7 @@ decompress-response@^6.0.0:
   dependencies:
     mimic-response "^3.1.0"
 
-deep-eql@^4.1.2:
+deep-eql@^4.1.3:
   version "4.1.3"
   resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-4.1.3.tgz#7c7775513092f7df98d8df9996dd085eb668cc6d"
   integrity sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw==
@@ -2803,16 +2769,26 @@ deepmerge@^4.2.2:
   resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.3.1.tgz#44b5f2147cd3b00d4b56137685966f26fd25dd4a"
   integrity sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==
 
+define-data-property@^1.0.1, define-data-property@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.1.tgz#c35f7cd0ab09883480d12ac5cb213715587800b3"
+  integrity sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==
+  dependencies:
+    get-intrinsic "^1.2.1"
+    gopd "^1.0.1"
+    has-property-descriptors "^1.0.0"
+
 define-lazy-prop@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f"
   integrity sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==
 
 define-properties@^1.1.3, define-properties@^1.1.4, define-properties@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.0.tgz#52988570670c9eacedd8064f4a990f2405849bd5"
-  integrity sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.1.tgz#10781cc616eb951a80a034bafcaa7377f6af2b6c"
+  integrity sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==
   dependencies:
+    define-data-property "^1.0.1"
     has-property-descriptors "^1.0.0"
     object-keys "^1.1.1"
 
@@ -2935,10 +2911,10 @@ ejs@^3.1.6:
   dependencies:
     jake "^10.8.5"
 
-electron-to-chromium@^1.4.477:
-  version "1.4.508"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.508.tgz#5641ff2f5ba11df4bd960fe6a2f9f70aa8b9af96"
-  integrity sha512-FFa8QKjQK/A5QuFr2167myhMesGrhlOBD+3cYNxO9/S4XzHEXesyTD/1/xF644gC8buFPz3ca6G1LOQD0tZrrg==
+electron-to-chromium@^1.4.535:
+  version "1.4.576"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.576.tgz#0c6940fdc0d60f7e34bd742b29d8fa847c9294d1"
+  integrity sha512-yXsZyXJfAqzWk1WKryr0Wl0MN2D47xodPvEEwlVePBnhU5E7raevLQR+E6b9JAD3GfL/7MbAL9ZtWQQPcLx7wA==
 
 elementtree@^0.1.7:
   version "0.1.7"
@@ -2981,26 +2957,26 @@ error-ex@^1.3.1:
   dependencies:
     is-arrayish "^0.2.1"
 
-es-abstract@^1.20.4, es-abstract@^1.22.1:
-  version "1.22.1"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.22.1.tgz#8b4e5fc5cefd7f1660f0f8e1a52900dfbc9d9ccc"
-  integrity sha512-ioRRcXMO6OFyRpyzV3kE1IIBd4WG5/kltnzdxSCqoP8CMGs/Li+M1uF5o7lOkZVFjDs+NLesthnF66Pg/0q0Lw==
+es-abstract@^1.22.1:
+  version "1.22.3"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.22.3.tgz#48e79f5573198de6dee3589195727f4f74bc4f32"
+  integrity sha512-eiiY8HQeYfYH2Con2berK+To6GrK2RxbPawDkGq4UiCQQfZHb6wX9qQqkbpPqaxQFcl8d9QzZqo0tGE0VcrdwA==
   dependencies:
     array-buffer-byte-length "^1.0.0"
-    arraybuffer.prototype.slice "^1.0.1"
+    arraybuffer.prototype.slice "^1.0.2"
     available-typed-arrays "^1.0.5"
-    call-bind "^1.0.2"
+    call-bind "^1.0.5"
     es-set-tostringtag "^2.0.1"
     es-to-primitive "^1.2.1"
-    function.prototype.name "^1.1.5"
-    get-intrinsic "^1.2.1"
+    function.prototype.name "^1.1.6"
+    get-intrinsic "^1.2.2"
     get-symbol-description "^1.0.0"
     globalthis "^1.0.3"
     gopd "^1.0.1"
-    has "^1.0.3"
     has-property-descriptors "^1.0.0"
     has-proto "^1.0.1"
     has-symbols "^1.0.3"
+    hasown "^2.0.0"
     internal-slot "^1.0.5"
     is-array-buffer "^3.0.2"
     is-callable "^1.2.7"
@@ -3008,32 +2984,32 @@ es-abstract@^1.20.4, es-abstract@^1.22.1:
     is-regex "^1.1.4"
     is-shared-array-buffer "^1.0.2"
     is-string "^1.0.7"
-    is-typed-array "^1.1.10"
+    is-typed-array "^1.1.12"
     is-weakref "^1.0.2"
-    object-inspect "^1.12.3"
+    object-inspect "^1.13.1"
     object-keys "^1.1.1"
     object.assign "^4.1.4"
-    regexp.prototype.flags "^1.5.0"
-    safe-array-concat "^1.0.0"
+    regexp.prototype.flags "^1.5.1"
+    safe-array-concat "^1.0.1"
     safe-regex-test "^1.0.0"
-    string.prototype.trim "^1.2.7"
-    string.prototype.trimend "^1.0.6"
-    string.prototype.trimstart "^1.0.6"
+    string.prototype.trim "^1.2.8"
+    string.prototype.trimend "^1.0.7"
+    string.prototype.trimstart "^1.0.7"
     typed-array-buffer "^1.0.0"
     typed-array-byte-length "^1.0.0"
     typed-array-byte-offset "^1.0.0"
     typed-array-length "^1.0.4"
     unbox-primitive "^1.0.2"
-    which-typed-array "^1.1.10"
+    which-typed-array "^1.1.13"
 
 es-set-tostringtag@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz#338d502f6f674301d710b80c8592de8a15f09cd8"
-  integrity sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.0.2.tgz#11f7cc9f63376930a5f20be4915834f4bc74f9c9"
+  integrity sha512-BuDyupZt65P9D2D2vA/zqcI3G5xRsklm5N3xCwuiy+/vKy8i0ifdsQP1sLgO4tZDSCaQUSnmC48khknGMV3D2Q==
   dependencies:
-    get-intrinsic "^1.1.3"
-    has "^1.0.3"
+    get-intrinsic "^1.2.2"
     has-tostringtag "^1.0.0"
+    hasown "^2.0.0"
 
 es-to-primitive@^1.2.1:
   version "1.2.1"
@@ -3120,17 +3096,18 @@ eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4
   integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==
 
 eslint@<9:
-  version "8.48.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.48.0.tgz#bf9998ba520063907ba7bfe4c480dc8be03c2155"
-  integrity sha512-sb6DLeIuRXxeM1YljSe1KEx9/YYeZFQWcV8Rq9HfigmdDEugjLEVEa1ozDjL6YDjBpQHPJxJzze+alxi4T3OLg==
+  version "8.53.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.53.0.tgz#14f2c8244298fcae1f46945459577413ba2697ce"
+  integrity sha512-N4VuiPjXDUa4xVeV/GC/RV3hQW9Nw+Y463lkWaKKXKYMvmRiRDAtfpuPFLN+E1/6ZhyR8J2ig+eVREnYgUsiag==
   dependencies:
     "@eslint-community/eslint-utils" "^4.2.0"
     "@eslint-community/regexpp" "^4.6.1"
-    "@eslint/eslintrc" "^2.1.2"
-    "@eslint/js" "8.48.0"
-    "@humanwhocodes/config-array" "^0.11.10"
+    "@eslint/eslintrc" "^2.1.3"
+    "@eslint/js" "8.53.0"
+    "@humanwhocodes/config-array" "^0.11.13"
     "@humanwhocodes/module-importer" "^1.0.1"
     "@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"
@@ -3220,7 +3197,7 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
-fast-glob@^3.2.12, fast-glob@^3.2.9:
+fast-glob@^3.2.9, fast-glob@^3.3.1:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.1.tgz#784b4e897340f3dbbef17413b3f11acf03c874c4"
   integrity sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==
@@ -3300,18 +3277,18 @@ find-up@^5.0.0:
     path-exists "^4.0.0"
 
 flat-cache@^3.0.4:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.1.0.tgz#0e54ab4a1a60fe87e2946b6b00657f1c99e1af3f"
-  integrity sha512-OHx4Qwrrt0E4jEIcI5/Xb+f+QmJYNj2rrK8wiIdQOIrB9WrrJL8cjZvXdXuBTkkEwEqLycb5BeZDV1o2i9bTew==
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.1.1.tgz#a02a15fdec25a8f844ff7cc658f03dd99eb4609b"
+  integrity sha512-/qM2b3LUIaIgviBQovTLvijfyOQXPtSRnRK26ksj2J7rzPIecePUIpJsZ4T02Qg+xiAEKIs5K8dsHEd+VaKa/Q==
   dependencies:
-    flatted "^3.2.7"
+    flatted "^3.2.9"
     keyv "^4.5.3"
     rimraf "^3.0.2"
 
-flatted@^3.2.7:
-  version "3.2.7"
-  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.7.tgz#609f39207cb614b89d0765b477cb2d437fbf9787"
-  integrity sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==
+flatted@^3.2.9:
+  version "3.2.9"
+  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.9.tgz#7eb4c67ca1ba34232ca9d2d93e9886e611ad7daf"
+  integrity sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==
 
 fontfaceobserver@2.*:
   version "2.3.0"
@@ -3385,12 +3362,12 @@ fsevents@~2.3.2:
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"
   integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==
 
-function-bind@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
-  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
+function-bind@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c"
+  integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==
 
-function.prototype.name@^1.1.5:
+function.prototype.name@^1.1.6:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.6.tgz#cdf315b7d90ee77a4c6ee216c3c3362da07533fd"
   integrity sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==
@@ -3415,20 +3392,20 @@ get-caller-file@^2.0.1, get-caller-file@^2.0.5:
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
-get-func-name@^2.0.0:
+get-func-name@^2.0.1, get-func-name@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.2.tgz#0d7cf20cd13fda808669ffa88f4ffc7a3943fc41"
   integrity sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==
 
-get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@^1.2.0, get-intrinsic@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.1.tgz#d295644fed4505fc9cde952c37ee12b477a83d82"
-  integrity sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==
+get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@^1.2.0, get-intrinsic@^1.2.1, get-intrinsic@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.2.tgz#281b7622971123e1ef4b3c90fd7539306da93f3b"
+  integrity sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==
   dependencies:
-    function-bind "^1.1.1"
-    has "^1.0.3"
+    function-bind "^1.1.2"
     has-proto "^1.0.1"
     has-symbols "^1.0.3"
+    hasown "^2.0.0"
 
 get-own-enumerable-property-symbols@^3.0.0:
   version "3.0.2"
@@ -3534,9 +3511,9 @@ globals@^11.1.0:
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
 globals@^13.19.0:
-  version "13.21.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-13.21.0.tgz#163aae12f34ef502f5153cfbdd3600f36c63c571"
-  integrity sha512-ybyme3s4yy/t/3s35bewwXKOf7cvzfreG2lH0lZl0JB7I4GxRP2ghxOK/Nb9EkRXdbBXZLfq/p/0W2JUONB/Gg==
+  version "13.23.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-13.23.0.tgz#ef31673c926a0976e1f61dab4dca57e0c0a8af02"
+  integrity sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==
   dependencies:
     type-fest "^0.20.2"
 
@@ -3621,11 +3598,11 @@ has-flag@^4.0.0:
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
 has-property-descriptors@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz#610708600606d36961ed04c196193b6a607fa861"
-  integrity sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz#52ba30b6c5ec87fd89fa574bc1c39125c6f65340"
+  integrity sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg==
   dependencies:
-    get-intrinsic "^1.1.1"
+    get-intrinsic "^1.2.2"
 
 has-proto@^1.0.1:
   version "1.0.1"
@@ -3644,12 +3621,12 @@ has-tostringtag@^1.0.0:
   dependencies:
     has-symbols "^1.0.2"
 
-has@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
-  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
+hasown@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.0.tgz#f4c513d454a57b7c7e1650778de226b11700546c"
+  integrity sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==
   dependencies:
-    function-bind "^1.1.1"
+    function-bind "^1.1.2"
 
 he@1.2.0:
   version "1.2.0"
@@ -3765,13 +3742,18 @@ ini@^3.0.1:
   resolved "https://registry.yarnpkg.com/ini/-/ini-3.0.1.tgz#c76ec81007875bc44d544ff7a11a55d12294102d"
   integrity sha512-it4HyVAUTKBc6m8e1iXWvXSTdndF7HbdN713+kvLrymxTaU4AUBWrJ4vEooP+V7fexnVD3LKcBshjGGPefSMUQ==
 
+ini@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-4.1.1.tgz#d95b3d843b1e906e56d6747d5447904ff50ce7a1"
+  integrity sha512-QQnnxNyfvmHFIsj7gkPcYymR8Jdw/o7mp5ZFihxn6h8Ci6fh3Dx4E1gPjpQEpIuPo9XVNY/ZUwh4BPMjGyL01g==
+
 internal-slot@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.5.tgz#f2a2ee21f668f8627a4667f309dc0f4fb6674986"
-  integrity sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.6.tgz#37e756098c4911c5e912b8edbf71ed3aa116f930"
+  integrity sha512-Xj6dv+PsbtwyPpEflsejS+oIZxmMlV44zAhG479uYu89MsjcYOhCFnNyKrkJrihbsiasQyY0afoCl/9BLR65bg==
   dependencies:
-    get-intrinsic "^1.2.0"
-    has "^1.0.3"
+    get-intrinsic "^1.2.2"
+    hasown "^2.0.0"
     side-channel "^1.0.4"
 
 is-array-buffer@^3.0.1, is-array-buffer@^3.0.2:
@@ -3821,11 +3803,11 @@ is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.7:
   integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==
 
 is-core-module@^2.13.0, is-core-module@^2.5.0:
-  version "2.13.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.13.0.tgz#bb52aa6e2cbd49a30c2ba68c42bf3435ba6072db"
-  integrity sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==
+  version "2.13.1"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.13.1.tgz#ad0d7532c6fea9da1ebdc82742d74525c6273384"
+  integrity sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==
   dependencies:
-    has "^1.0.3"
+    hasown "^2.0.0"
 
 is-date-object@^1.0.1:
   version "1.0.5"
@@ -3954,7 +3936,7 @@ is-text-path@^1.0.1:
   dependencies:
     text-extensions "^1.0.0"
 
-is-typed-array@^1.1.10, is-typed-array@^1.1.9:
+is-typed-array@^1.1.10, is-typed-array@^1.1.12, is-typed-array@^1.1.9:
   version "1.1.12"
   resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.12.tgz#d0bab5686ef4a76f7a73097b95470ab199c57d4a"
   integrity sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==
@@ -4159,9 +4141,9 @@ jsonpointer@^5.0.0:
   integrity sha512-p/nXbhSEcu3pZRdkW1OfJhpsVtW1gd4Wa1fnQc9YLiTfAjn0312eMKimbdIQzuZl9aa9xUGaRlP9T/CJE/ditQ==
 
 keyv@^4.5.3:
-  version "4.5.3"
-  resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.3.tgz#00873d2b046df737963157bd04f294ca818c9c25"
-  integrity sha512-QCiSav9WaX1PgETJ+SpNnx2PRRapJ/oRSXM4VO5OGYGSjrxbKPVFVhB3l2OCbLCk329N8qyAtsJjSjvVBWzEug==
+  version "4.5.4"
+  resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.4.tgz#a879a99e29452f942439f2a405e3af8b31d4de93"
+  integrity sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==
   dependencies:
     json-buffer "3.0.1"
 
@@ -4260,12 +4242,12 @@ lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21:
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
 
-loupe@^2.3.1, loupe@^2.3.6:
-  version "2.3.6"
-  resolved "https://registry.yarnpkg.com/loupe/-/loupe-2.3.6.tgz#76e4af498103c532d1ecc9be102036a21f787b53"
-  integrity sha512-RaPMZKiMy8/JruncMU5Bt6na1eftNoo++R4Y+N2FrxkDVTrGvcyzFTsaGif4QTeKESheMGegbhw6iUAq+5A8zA==
+loupe@^2.3.6:
+  version "2.3.7"
+  resolved "https://registry.yarnpkg.com/loupe/-/loupe-2.3.7.tgz#6e69b7d4db7d3ab436328013d37d1c8c3540c697"
+  integrity sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==
   dependencies:
-    get-func-name "^2.0.0"
+    get-func-name "^2.0.1"
 
 lru-cache@^5.1.1:
   version "5.1.1"
@@ -4294,9 +4276,9 @@ magic-string@^0.25.0, magic-string@^0.25.7:
     sourcemap-codec "^1.4.8"
 
 magic-string@^0.30.1:
-  version "0.30.3"
-  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.3.tgz#403755dfd9d6b398dfa40635d52e96c5ac095b85"
-  integrity sha512-B7xGbll2fG/VjP+SWg4sX3JynwIU0mjoTc6MPpKNuIvftk6u6vqhDnk1R80b8C2GBR6ywqy+1DcKBrevBg+bmw==
+  version "0.30.5"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.5.tgz#1994d980bd1c8835dc6e78db7cbd4ae4f24746f9"
+  integrity sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==
   dependencies:
     "@jridgewell/sourcemap-codec" "^1.4.15"
 
@@ -4453,9 +4435,9 @@ minipass@^5.0.0:
   integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==
 
 "minipass@^5.0.0 || ^6.0.2 || ^7.0.0":
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.0.3.tgz#05ea638da44e475037ed94d1c7efcc76a25e1974"
-  integrity sha512-LhbbwCfz3vsb12j/WkWQPZfKTsgqIe1Nf/ti1pKjYESGLHIVjWU96G9/ljLH4F9mWNVhlQOm0VySdAWzf05dpg==
+  version "7.0.4"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.0.4.tgz#dbce03740f50a4786ba994c1fb908844d27b038c"
+  integrity sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==
 
 minizlib@^2.1.1:
   version "2.1.2"
@@ -4517,10 +4499,10 @@ napi-build-utils@^1.0.1:
   resolved "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.2.tgz#b1fddc0b2c46e380a0b7a76f984dd47c41a13806"
   integrity sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==
 
-native-run@^1.5.0, native-run@^1.7.2:
-  version "1.7.2"
-  resolved "https://registry.yarnpkg.com/native-run/-/native-run-1.7.2.tgz#42ee36102039c2a892507bbc1cb75695f676098b"
-  integrity sha512-2aahC8iXIO8BcvEukVMrYwL5sXurkuIGyQgfSGBto832W6ejV+cB5Ww+2/CRxmyozhbxARJ2OMpEGPV8sTqsrQ==
+native-run@^1.5.0, native-run@^1.7.3:
+  version "1.7.4"
+  resolved "https://registry.yarnpkg.com/native-run/-/native-run-1.7.4.tgz#b98b74812805cef8665cfceec651e66e662123e3"
+  integrity sha512-yDEwTp66vmXpqFiSQzz4sVQgyq5U58gGRovglY4GHh12ITyWa6mh6Lbpm2gViVOVD1JYFtYnwcgr7GTFBinXNA==
   dependencies:
     "@ionic/utils-fs" "^3.1.6"
     "@ionic/utils-terminal" "^2.3.3"
@@ -4534,6 +4516,21 @@ native-run@^1.5.0, native-run@^1.7.2:
     tslib "^2.4.0"
     yauzl "^2.10.0"
 
+"native-run@file:../native-run":
+  version "2.0.0"
+  dependencies:
+    "@ionic/utils-fs" "^3.1.7"
+    "@ionic/utils-terminal" "^2.3.4"
+    bplist-parser "^0.3.2"
+    debug "^4.3.4"
+    elementtree "^0.1.7"
+    ini "^4.1.1"
+    plist "^3.1.0"
+    split2 "^4.2.0"
+    through2 "^4.0.2"
+    tslib "^2.6.2"
+    yauzl "^2.10.0"
+
 natural-compare-lite@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz#17b09581988979fddafe0201e931ba933c96cbb4"
@@ -4550,9 +4547,9 @@ neo-async@^2.6.2:
   integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
 
 node-abi@^3.3.0:
-  version "3.47.0"
-  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.47.0.tgz#6cbfa2916805ae25c2b7156ca640131632eb05e8"
-  integrity sha512-2s6B2CWZM//kPgwnuI0KrYwNjfdByE25zvAaEpq9IH4zcNsarH8Ihu/UuX6XMPEogDAxkuUFeZn60pXNHAqn3A==
+  version "3.51.0"
+  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.51.0.tgz#970bf595ef5a26a271307f8a4befa02823d4e87d"
+  integrity sha512-SQkEP4hmNWjlniS5zdnfIXTk1x7Ome85RDzHlTbBtzE97Gfwz/Ipw4v/Ryk20DWIy3yCNVLVlGKApCnmvYoJbA==
   dependencies:
     semver "^7.3.5"
 
@@ -4649,10 +4646,10 @@ nwsapi@^2.2.0:
   resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.7.tgz#738e0707d3128cb750dddcfe90e4610482df0f30"
   integrity sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ==
 
-object-inspect@^1.12.3, object-inspect@^1.9.0:
-  version "1.12.3"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.3.tgz#ba62dffd67ee256c8c086dfae69e016cd1f198b9"
-  integrity sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==
+object-inspect@^1.13.1, object-inspect@^1.9.0:
+  version "1.13.1"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.1.tgz#b96c6109324ccfef6b12216a956ca4dc2ff94bc2"
+  integrity sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==
 
 object-keys@^1.1.1:
   version "1.1.1"
@@ -4890,12 +4887,21 @@ pkg-types@^1.0.3:
     mlly "^1.2.0"
     pathe "^1.1.0"
 
-playwright-core@1.37.1:
-  version "1.37.1"
-  resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.37.1.tgz#cb517d52e2e8cb4fa71957639f1cd105d1683126"
-  integrity sha512-17EuQxlSIYCmEMwzMqusJ2ztDgJePjrbttaefgdsiqeLWidjYz9BxXaTaZWxH1J95SHGk6tjE+dwgWILJoUZfA==
+playwright-core@1.39.0:
+  version "1.39.0"
+  resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.39.0.tgz#efeaea754af4fb170d11845b8da30b2323287c63"
+  integrity sha512-+k4pdZgs1qiM+OUkSjx96YiKsXsmb59evFoqv8SKO067qBA+Z2s/dCzJij/ZhdQcs2zlTAgRKfeiiLm8PQ2qvw==
+
+playwright@1.39.0:
+  version "1.39.0"
+  resolved "https://registry.yarnpkg.com/playwright/-/playwright-1.39.0.tgz#184c81cd6478f8da28bcd9e60e94fcebf566e077"
+  integrity sha512-naE5QT11uC/Oiq0BwZ50gDmy8c8WLPRTEWuSSFVG2egBka/1qMoSqYQcROMT9zLwJ86oPofcTH2jBY/5wWOgIw==
+  dependencies:
+    playwright-core "1.39.0"
+  optionalDependencies:
+    fsevents "2.3.2"
 
-plist@^3.0.2, plist@^3.0.4, plist@^3.0.5, plist@^3.0.6:
+plist@^3.0.2, plist@^3.0.4, plist@^3.0.5, plist@^3.0.6, plist@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/plist/-/plist-3.1.0.tgz#797a516a93e62f5bde55e0b9cc9c967f860893c9"
   integrity sha512-uysumyrvkUX0rX/dEVqt8gC3sTBzd4zoWfLeS29nb53imdaXVvLINYXTI2GNqzaMuvacNx4uJQ8+b3zXR0pkgQ==
@@ -4951,7 +4957,7 @@ pretty-bytes@^5.3.0:
   resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.6.0.tgz#356256f643804773c82f64723fe78c92c62beaeb"
   integrity sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==
 
-pretty-bytes@^6.0.0:
+pretty-bytes@^6.1.1:
   version "6.1.1"
   resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-6.1.1.tgz#38cd6bb46f47afbf667c202cfc754bffd2016a3b"
   integrity sha512-mQUvGU6aUFQ+rNvTIAcZuWGRT9a6f6Yrg9bHs4ImKF+HZCEK+plBvnAZYSIQztknZF2qnzNtr6F8s0+IuptdlQ==
@@ -4966,9 +4972,9 @@ pretty-format@^27.0.0, pretty-format@^27.5.1:
     react-is "^17.0.1"
 
 pretty-format@^29.5.0:
-  version "29.6.3"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-29.6.3.tgz#d432bb4f1ca6f9463410c3fb25a0ba88e594ace7"
-  integrity sha512-ZsBgjVhFAj5KeK+nHfF1305/By3lechHQSMWCTl8iHSbfOm2TN5nHEtFc/+W7fAyUeCs2n5iow72gld4gW0xDw==
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-29.7.0.tgz#ca42c758310f365bfa71a0bda0a807160b776812"
+  integrity sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==
   dependencies:
     "@jest/schemas" "^29.6.3"
     ansi-styles "^5.0.0"
@@ -5006,9 +5012,9 @@ pump@^3.0.0:
     once "^1.3.1"
 
 punycode@^2.1.0, punycode@^2.1.1:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz#f67fa67c94da8f4d0cfff981aee4118064199b8f"
-  integrity sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.1.tgz#027422e2faec0b25e1549c3e1bd8309b9133b6e5"
+  integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==
 
 q@^1.5.1:
   version "1.5.1"
@@ -5131,9 +5137,9 @@ redent@^3.0.0:
     strip-indent "^3.0.0"
 
 regenerate-unicode-properties@^10.1.0:
-  version "10.1.0"
-  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz#7c3192cab6dd24e21cb4461e5ddd7dd24fa8374c"
-  integrity sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==
+  version "10.1.1"
+  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.1.tgz#6b0e05489d9076b04c436f318d9b067bba459480"
+  integrity sha512-X007RyZLsCJVVrjgEFVpLUTZwyOZk3oiL75ZcuYjlIWd6rNJtOjkBwQc5AsRrpbKVkxN6sklw/k/9m2jJYOf8Q==
   dependencies:
     regenerate "^1.4.2"
 
@@ -5159,14 +5165,14 @@ regexp-to-ast@0.5.0:
   resolved "https://registry.yarnpkg.com/regexp-to-ast/-/regexp-to-ast-0.5.0.tgz#56c73856bee5e1fef7f73a00f1473452ab712a24"
   integrity sha512-tlbJqcMHnPKI9zSrystikWKwHkBqu2a/Sgw01h3zFjvYrMxEDYHzzoMZnUrbIfpTFEsoRnnviOXNCzFiSc54Qw==
 
-regexp.prototype.flags@^1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz#fe7ce25e7e4cca8db37b6634c8a2c7009199b9cb"
-  integrity sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==
+regexp.prototype.flags@^1.5.0, regexp.prototype.flags@^1.5.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz#90ce989138db209f81492edd734183ce99f9677e"
+  integrity sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg==
   dependencies:
     call-bind "^1.0.2"
     define-properties "^1.2.0"
-    functions-have-names "^1.2.3"
+    set-function-name "^2.0.0"
 
 regexpu-core@^5.3.1:
   version "5.3.2"
@@ -5222,9 +5228,9 @@ resolve-from@^4.0.0:
   integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
 
 resolve@^1.10.0, resolve@^1.14.2, resolve@^1.19.0:
-  version "1.22.4"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.4.tgz#1dc40df46554cdaf8948a486a10f6ba1e2026c34"
-  integrity sha512-PXNdCiPqDqeUou+w1C2eTQbNfxKSuMxqTCuvlmmMsk1NWHL5fRrhY6Pl0qEYYc6+QqGClco1Qj8XnjPego4wfg==
+  version "1.22.8"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d"
+  integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==
   dependencies:
     is-core-module "^2.13.0"
     path-parse "^1.0.7"
@@ -5267,9 +5273,9 @@ rollup@^2.43.1:
     fsevents "~2.3.2"
 
 rollup@^3.27.1:
-  version "3.28.1"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-3.28.1.tgz#fb44aa6d5e65c7e13fd5bcfff266d0c4ea9ba433"
-  integrity sha512-R9OMQmIHJm9znrU3m3cpE8uhN0fGdXiawME7aZIpQqvpS/85+Vt1Hq1/yVIcYfOmaQiHjvXkQAoJukvLpau6Yw==
+  version "3.29.4"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-3.29.4.tgz#4d70c0f9834146df8705bfb69a9a19c9e1109981"
+  integrity sha512-oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw==
   optionalDependencies:
     fsevents "~2.3.2"
 
@@ -5280,13 +5286,13 @@ run-parallel@^1.1.9:
   dependencies:
     queue-microtask "^1.2.2"
 
-safe-array-concat@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.0.0.tgz#2064223cba3c08d2ee05148eedbc563cd6d84060"
-  integrity sha512-9dVEFruWIsnie89yym+xWTAYASdpw3CJV7Li/6zBewGf9z2i1j31rP6jnY0pHEO4QZh6N0K11bFjWmdR8UGdPQ==
+safe-array-concat@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.0.1.tgz#91686a63ce3adbea14d61b14c99572a8ff84754c"
+  integrity sha512-6XbUAseYE2KtOuGueyeobCySj9L4+66Tn6KQMOPQJrAJEowYKW/YR/MGJZl7FdydUdaFu4LYyDZjxf4/Nmo23Q==
   dependencies:
     call-bind "^1.0.2"
-    get-intrinsic "^1.2.0"
+    get-intrinsic "^1.2.1"
     has-symbols "^1.0.3"
     isarray "^2.0.5"
 
@@ -5320,9 +5326,9 @@ sax@1.1.4:
   integrity sha512-5f3k2PbGGp+YtKJjOItpg3P99IMD84E4HOvcfleTb5joCHNXYLsR9yWFPOYGgaeMPDubQILTCMdsFb2OMeOjtg==
 
 sax@>=0.6.0, sax@^1.2.4:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
-  integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/sax/-/sax-1.3.0.tgz#a5dbe77db3be05c9d1ee7785dbd3ea9de51593d0"
+  integrity sha512-0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA==
 
 saxes@^5.0.1:
   version "5.0.1"
@@ -5365,6 +5371,25 @@ set-blocking@^2.0.0:
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
   integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==
 
+set-function-length@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.1.1.tgz#4bc39fafb0307224a33e106a7d35ca1218d659ed"
+  integrity sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ==
+  dependencies:
+    define-data-property "^1.1.1"
+    get-intrinsic "^1.2.1"
+    gopd "^1.0.1"
+    has-property-descriptors "^1.0.0"
+
+set-function-name@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/set-function-name/-/set-function-name-2.0.1.tgz#12ce38b7954310b9f61faa12701620a0c882793a"
+  integrity sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==
+  dependencies:
+    define-data-property "^1.0.1"
+    functions-have-names "^1.2.3"
+    has-property-descriptors "^1.0.0"
+
 sharp@^0.30.7:
   version "0.30.7"
   resolved "https://registry.yarnpkg.com/sharp/-/sharp-0.30.7.tgz#7862bda98804fdd1f0d5659c85e3324b90d94c7c"
@@ -5518,9 +5543,9 @@ spdx-expression-parse@^3.0.0:
     spdx-license-ids "^3.0.0"
 
 spdx-license-ids@^3.0.0:
-  version "3.0.13"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.13.tgz#7189a474c46f8d47c7b0da4b987bb45e908bd2d5"
-  integrity sha512-XkD+zwiqXHikFZm4AX/7JSCXA98U5Db4AFd5XUg/+9UNtnH75+Z9KxtpYiJZx36mUDVOwH83pl7yvCer6ewM3w==
+  version "3.0.16"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.16.tgz#a14f64e0954f6e25cc6587bd4f392522db0d998f"
+  integrity sha512-eWN+LnM3GR6gPu35WxNgbGl8rmY1AEmoMDvL/QD6zYmPWgywxWqJWNdLGT+ke8dKNWrcYgYjPpG5gbTfghP8rw==
 
 split2@^3.0.0:
   version "3.2.2"
@@ -5529,7 +5554,7 @@ split2@^3.0.0:
   dependencies:
     readable-stream "^3.0.0"
 
-split2@^4.1.0:
+split2@^4.1.0, split2@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/split2/-/split2-4.2.0.tgz#c9c5920904d148bab0b9f67145f245a86aadbfa4"
   integrity sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==
@@ -5566,9 +5591,9 @@ string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
     strip-ansi "^6.0.1"
 
 string.prototype.matchall@^4.0.6:
-  version "4.0.9"
-  resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.9.tgz#148779de0f75d36b13b15885fec5cadde994520d"
-  integrity sha512-6i5hL3MqG/K2G43mWXWgP+qizFW/QH/7kCNN13JrJS5q48FN5IKksLDscexKP3dnmB6cdm9jlNgAsWNLpSykmA==
+  version "4.0.10"
+  resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.10.tgz#a1553eb532221d4180c51581d6072cd65d1ee100"
+  integrity sha512-rGXbGmOEosIQi6Qva94HUjgPs9vKW+dkG7Y8Q5O2OYkWL6wFaTRZO8zM4mhP94uX55wgyrXzfS2aGtGzUL7EJQ==
   dependencies:
     call-bind "^1.0.2"
     define-properties "^1.2.0"
@@ -5577,27 +5602,28 @@ string.prototype.matchall@^4.0.6:
     has-symbols "^1.0.3"
     internal-slot "^1.0.5"
     regexp.prototype.flags "^1.5.0"
+    set-function-name "^2.0.0"
     side-channel "^1.0.4"
 
-string.prototype.trim@^1.2.7:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz#a68352740859f6893f14ce3ef1bb3037f7a90533"
-  integrity sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==
+string.prototype.trim@^1.2.8:
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz#f9ac6f8af4bd55ddfa8895e6aea92a96395393bd"
+  integrity sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
 
-string.prototype.trimend@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz#c4a27fa026d979d79c04f17397f250a462944533"
-  integrity sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==
+string.prototype.trimend@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.7.tgz#1bb3afc5008661d73e2dc015cd4853732d6c471e"
+  integrity sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
 
-string.prototype.trimstart@^1.0.6:
+string.prototype.trimstart@^1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.7.tgz#d4cdb44b83a4737ffbac2d406e405d43d0184298"
   integrity sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg==
@@ -5754,9 +5780,9 @@ tempy@^1.0.1:
     unique-string "^2.0.0"
 
 terser@^5.0.0:
-  version "5.19.4"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-5.19.4.tgz#941426fa482bf9b40a0308ab2b3cd0cf7c775ebd"
-  integrity sha512-6p1DjHeuluwxDXcuT9VR8p64klWJKo1ILiy19s6C9+0Bh2+NWTX6nD9EPppiER4ICkHDVB1RkVpin/YW2nQn/g==
+  version "5.24.0"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.24.0.tgz#4ae50302977bca4831ccc7b4fef63a3c04228364"
+  integrity sha512-ZpGR4Hy3+wBEzVEnHvstMvqpD/nABNelQn/z2r0fjVWGQsN3bpOLzQlqDxmb4CDZnXq5lpjnQ+mHQLAOpfM5iw==
   dependencies:
     "@jridgewell/source-map" "^0.3.3"
     acorn "^8.8.2"
@@ -5794,9 +5820,9 @@ through@2, "through@>=2.2.7 <3":
   integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==
 
 tinybench@^2.5.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/tinybench/-/tinybench-2.5.0.tgz#4711c99bbf6f3e986f67eb722fed9cddb3a68ba5"
-  integrity sha512-kRwSG8Zx4tjF9ZiyH4bhaebu+EDz1BOx9hOigYHlUW4xxI/wKIUQUqo018UlU4ar6ATPBsaMrdbKZ+tmPdohFA==
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/tinybench/-/tinybench-2.5.1.tgz#3408f6552125e53a5a48adee31261686fd71587e"
+  integrity sha512-65NKvSuAVDP/n4CqH+a9w2kTlLReS9vhsAP06MWx+/89nMinJyB2icyl58RIcqCmIggpojIGeuJGhjU1aGMBSg==
 
 tinypool@^0.7.0:
   version "0.7.0"
@@ -5804,9 +5830,9 @@ tinypool@^0.7.0:
   integrity sha512-zSYNUlYSMhJ6Zdou4cJwo/p7w5nmAH17GRfU/ui3ctvjXFErXXkruT4MWW6poDeXgCaIBlGLrfU6TbTXxyGMww==
 
 tinyspy@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/tinyspy/-/tinyspy-2.1.1.tgz#9e6371b00c259e5c5b301917ca18c01d40ae558c"
-  integrity sha512-XPJL2uSzcOyBMky6OFrusqWlzfFrXtE0hPuMgW8A2HmaqrPo4ZQHRN/V0QXN3FSjKxpsbRrFc5LI7KOwBsT1/w==
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/tinyspy/-/tinyspy-2.2.0.tgz#9dc04b072746520b432f77ea2c2d17933de5d6ce"
+  integrity sha512-d2eda04AN/cPOR89F7Xv5bK/jrQEhmcLFe6HFldoeO9AJtps+fqEnh486vnT/8y4bw38pSyxDcTCAq+Ks2aJTg==
 
 tmp@^0.2.1:
   version "0.2.1"
@@ -5897,7 +5923,7 @@ tslib@^1.8.1:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
-tslib@^2.0.1, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.4.0:
+tslib@^2.0.1, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.4.0, tslib@^2.6.2:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae"
   integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==
@@ -5923,7 +5949,7 @@ type-check@^0.4.0, type-check@~0.4.0:
   dependencies:
     prelude-ls "^1.2.1"
 
-type-detect@^4.0.0, type-detect@^4.0.5:
+type-detect@^4.0.0, type-detect@^4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
   integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==
@@ -5998,9 +6024,9 @@ typescript@<5:
   integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==
 
 ufo@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/ufo/-/ufo-1.3.0.tgz#c92f8ac209daff607c57bbd75029e190930a0019"
-  integrity sha512-bRn3CsoojyNStCZe0BG0Mt4Nr/4KF+rhFlnNXybgqt5pXHNFRlqinSoQaTrGyzE4X8aHplSb+TorH+COin9Yxw==
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/ufo/-/ufo-1.3.1.tgz#e085842f4627c41d4c1b60ebea1f75cdab4ce86b"
+  integrity sha512-uY/99gMLIOlJPwATcMVYfqDSxUR9//AUcgZMzwfSTJPDKzA1S8mX4VLqa+fiAtveraQUBCz4FFcwVZBGbwBXIw==
 
 uglify-js@^3.1.4:
   version "3.17.4"
@@ -6022,6 +6048,11 @@ undefsafe@^2.0.5:
   resolved "https://registry.yarnpkg.com/undefsafe/-/undefsafe-2.0.5.tgz#38733b9327bdcd226db889fb723a6efd162e6e2c"
   integrity sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==
 
+undici-types@~5.26.4:
+  version "5.26.5"
+  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
+  integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
+
 unicode-canonical-property-names-ecmascript@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc"
@@ -6058,9 +6089,9 @@ universalify@^0.2.0:
   integrity sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==
 
 universalify@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"
-  integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.1.tgz#168efc2180964e6386d061e094df61afe239b18d"
+  integrity sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==
 
 untildify@^4.0.0:
   version "4.0.0"
@@ -6072,10 +6103,10 @@ upath@^1.2.0:
   resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894"
   integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==
 
-update-browserslist-db@^1.0.11:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz#9a2a641ad2907ae7b3616506f4b977851db5b940"
-  integrity sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==
+update-browserslist-db@^1.0.13:
+  version "1.0.13"
+  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz#3c5e4f5c083661bd38ef64b6328c26ed6c8248c4"
+  integrity sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==
   dependencies:
     escalade "^3.1.1"
     picocolors "^1.0.0"
@@ -6131,33 +6162,33 @@ vi-canvas-mock@^1.0.0:
     cssfontparser "^1.2.1"
     moo-color "^1.0.2"
 
-vite-node@0.34.3:
-  version "0.34.3"
-  resolved "https://registry.yarnpkg.com/vite-node/-/vite-node-0.34.3.tgz#de134fe38bc1555ac8ab5e489d7df6159a3e1a4c"
-  integrity sha512-+0TzJf1g0tYXj6tR2vEyiA42OPq68QkRZCu/ERSo2PtsDJfBpDyEfuKbRvLmZqi/CgC7SCBtyC+WjTGNMRIaig==
+vite-node@0.34.6:
+  version "0.34.6"
+  resolved "https://registry.yarnpkg.com/vite-node/-/vite-node-0.34.6.tgz#34d19795de1498562bf21541a58edcd106328a17"
+  integrity sha512-nlBMJ9x6n7/Amaz6F3zJ97EBwR2FkzhBRxF5e+jE6LA3yi6Wtc2lyTij1OnDMIr34v5g/tVQtsVAzhT0jc5ygA==
   dependencies:
     cac "^6.7.14"
     debug "^4.3.4"
     mlly "^1.4.0"
     pathe "^1.1.1"
     picocolors "^1.0.0"
-    vite "^3.0.0 || ^4.0.0"
+    vite "^3.0.0 || ^4.0.0 || ^5.0.0-0"
 
 vite-plugin-pwa@^0.16.4:
-  version "0.16.4"
-  resolved "https://registry.yarnpkg.com/vite-plugin-pwa/-/vite-plugin-pwa-0.16.4.tgz#cd2618c8b4f83eac1493f2ed7b05f72552a2b735"
-  integrity sha512-lmwHFIs9zI2H9bXJld/zVTbCqCQHZ9WrpyDMqosICDV0FVnCJwniX1NMDB79HGTIZzOQkY4gSZaVTJTw6maz/Q==
+  version "0.16.7"
+  resolved "https://registry.yarnpkg.com/vite-plugin-pwa/-/vite-plugin-pwa-0.16.7.tgz#3dcacc342766ff3598472ac7d5e0782d14e2853e"
+  integrity sha512-4WMA5unuKlHs+koNoykeuCfTcqEGbiTRr8sVYUQMhc6tWxZpSRnv9Ojk4LKmqVhoPGHfBVCdGaMo8t9Qidkc1Q==
   dependencies:
     debug "^4.3.4"
-    fast-glob "^3.2.12"
-    pretty-bytes "^6.0.0"
+    fast-glob "^3.3.1"
+    pretty-bytes "^6.1.1"
     workbox-build "^7.0.0"
     workbox-window "^7.0.0"
 
-"vite@^3.0.0 || ^4.0.0", vite@^4.0.0:
-  version "4.4.9"
-  resolved "https://registry.yarnpkg.com/vite/-/vite-4.4.9.tgz#1402423f1a2f8d66fd8d15e351127c7236d29d3d"
-  integrity sha512-2mbUn2LlUmNASWwSCNSJ/EG2HuSRTnVNaydp6vMCm5VIqJsjMfbIWtbH2kDuwUVW5mMUKKZvGPX/rqeqVvv1XA==
+"vite@^3.0.0 || ^4.0.0 || ^5.0.0-0", "vite@^3.1.0 || ^4.0.0 || ^5.0.0-0", vite@^4.0.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/vite/-/vite-4.5.0.tgz#ec406295b4167ac3bc23e26f9c8ff559287cff26"
+  integrity sha512-ulr8rNLA6rkyFAlVWw2q5YJ91v098AFQ2R0PRFwPzREXOUJQPtFUG0t+/ZikhaOCDqFoDhN6/v8Sq0o4araFAw==
   dependencies:
     esbuild "^0.18.10"
     postcss "^8.4.27"
@@ -6166,22 +6197,22 @@ vite-plugin-pwa@^0.16.4:
     fsevents "~2.3.2"
 
 vitest@<1.0.0:
-  version "0.34.3"
-  resolved "https://registry.yarnpkg.com/vitest/-/vitest-0.34.3.tgz#863d61c133d01b16e49fd52d380c09fa5ac03188"
-  integrity sha512-7+VA5Iw4S3USYk+qwPxHl8plCMhA5rtfwMjgoQXMT7rO5ldWcdsdo3U1QD289JgglGK4WeOzgoLTsGFu6VISyQ==
+  version "0.34.6"
+  resolved "https://registry.yarnpkg.com/vitest/-/vitest-0.34.6.tgz#44880feeeef493c04b7f795ed268f24a543250d7"
+  integrity sha512-+5CALsOvbNKnS+ZHMXtuUC7nL8/7F1F2DnHGjSsszX8zCjWSSviphCb/NuS9Nzf4Q03KyyDRBAXhF/8lffME4Q==
   dependencies:
     "@types/chai" "^4.3.5"
     "@types/chai-subset" "^1.3.3"
     "@types/node" "*"
-    "@vitest/expect" "0.34.3"
-    "@vitest/runner" "0.34.3"
-    "@vitest/snapshot" "0.34.3"
-    "@vitest/spy" "0.34.3"
-    "@vitest/utils" "0.34.3"
+    "@vitest/expect" "0.34.6"
+    "@vitest/runner" "0.34.6"
+    "@vitest/snapshot" "0.34.6"
+    "@vitest/spy" "0.34.6"
+    "@vitest/utils" "0.34.6"
     acorn "^8.9.0"
     acorn-walk "^8.2.0"
     cac "^6.7.14"
-    chai "^4.3.7"
+    chai "^4.3.10"
     debug "^4.3.4"
     local-pkg "^0.4.3"
     magic-string "^0.30.1"
@@ -6191,8 +6222,8 @@ vitest@<1.0.0:
     strip-literal "^1.0.1"
     tinybench "^2.5.0"
     tinypool "^0.7.0"
-    vite "^3.0.0 || ^4.0.0"
-    vite-node "0.34.3"
+    vite "^3.1.0 || ^4.0.0 || ^5.0.0-0"
+    vite-node "0.34.6"
     why-is-node-running "^2.2.2"
 
 w3c-hr-time@^1.0.2:
@@ -6292,13 +6323,13 @@ which-module@^2.0.0:
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.1.tgz#776b1fe35d90aebe99e8ac15eb24093389a4a409"
   integrity sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==
 
-which-typed-array@^1.1.10, which-typed-array@^1.1.11:
-  version "1.1.11"
-  resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.11.tgz#99d691f23c72aab6768680805a271b69761ed61a"
-  integrity sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==
+which-typed-array@^1.1.11, which-typed-array@^1.1.13:
+  version "1.1.13"
+  resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.13.tgz#870cd5be06ddb616f504e7b039c4c24898184d36"
+  integrity sha512-P5Nra0qjSncduVPEAr7xhoF5guty49ArDTwzJ/yNuPIbZppyRxFQsRCWrocxIY+CnMVG+qfbU2FmDKyvSGClow==
   dependencies:
     available-typed-arrays "^1.0.5"
-    call-bind "^1.0.2"
+    call-bind "^1.0.4"
     for-each "^0.3.3"
     gopd "^1.0.1"
     has-tostringtag "^1.0.0"
@@ -6505,9 +6536,9 @@ wrappy@1:
   integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
 
 ws@^8.2.3:
-  version "8.13.0"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-8.13.0.tgz#9a9fb92f93cf41512a0735c8f4dd09b8a1211cd0"
-  integrity sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==
+  version "8.14.2"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.14.2.tgz#6c249a806eb2db7a20d26d51e7709eab7b2e6c7f"
+  integrity sha512-wEBG1ftX4jcglPxgFCMJmZ2PLtSbJ2Peg6TmpJFTbe9GZYOQCDPdMYu/Tm0/bGZkw8paZnJY45J4K2PZrLYq8g==
 
 xcode@^3.0.1:
   version "3.0.1"
@@ -6600,16 +6631,11 @@ xterm-addon-webgl@^0.14.0:
   resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.14.0.tgz#bd9136710bd5d130a0a51fd42e6d14ea39348236"
   integrity sha512-zcxL4RVVjeS7NNFeKe5HHQI8OUEx3wZpE4EqLoTVipa2UrTR+qLsigo16UEp/yVcYBMhK7tsJ/AJokoEe/f0mw==
 
-xterm@*:
+xterm@*, xterm@^5.1.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/xterm/-/xterm-5.3.0.tgz#867daf9cc826f3d45b5377320aabd996cb0fce46"
   integrity sha512-8QqjlekLUFTrU6x7xck1MsPzPA571K5zNqWm0M0oroYEWVOptZ0+ubQSkQ3uxIEhcIHRujJy6emDWX4A7qyFzg==
 
-xterm@^5.1.0:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/xterm/-/xterm-5.2.1.tgz#b3fea7bdb55b9be1d4b31f4cd1091f26ac42afb8"
-  integrity sha512-cs5Y1fFevgcdoh2hJROMVIWwoBHD80P1fIP79gopLHJIE4kTzzblanoivxTiQ4+92YM9IxS36H1q0MxIJXQBcA==
-
 y18n@^4.0.0:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf"

From b813cfb037ad9409c9830df438a283c13f3b3a9b Mon Sep 17 00:00:00 2001
From: Benny Daon <benny@tuzig.com>
Date: Mon, 6 Nov 2023 12:53:34 +0200
Subject: [PATCH 29/53] WIP: Making it work

need to go back to application/sdp and fix restore
---
 ios/App/App.xcodeproj/project.pbxproj |  2 +-
 src/peerbook.ts                       |  2 +-
 src/webrtc_session.ts                 | 63 ++++++++++++++-------------
 3 files changed, 34 insertions(+), 33 deletions(-)

diff --git a/ios/App/App.xcodeproj/project.pbxproj b/ios/App/App.xcodeproj/project.pbxproj
index 1f2031e7..8c389fa9 100644
--- a/ios/App/App.xcodeproj/project.pbxproj
+++ b/ios/App/App.xcodeproj/project.pbxproj
@@ -224,7 +224,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/bash;
-			shellScript = "# Type a script or drag a script file from your workspace to insert its path.\ncd ../..\n/usr/local/bin/npx cap copy ios\n";
+			shellScript = "# Type a script or drag a script file from your workspace to insert its path.\ncd ../..\n/usr/local/bin/npx cap sync ios\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 
diff --git a/src/peerbook.ts b/src/peerbook.ts
index 59158199..b8de29fa 100644
--- a/src/peerbook.ts
+++ b/src/peerbook.ts
@@ -250,7 +250,7 @@ export class PeerbookConnection {
                 this.session = null
             }
             const schema = terminal7.conf.peerbook.insecure? "http" : "https"
-            const url = `${schema}://${terminal7.conf.net.peerbook}/we`
+            const url = `${schema}://${terminal7.conf.net.peerbook}/offer`
             if (params?.token)
                 this.headers.set("Authorization", `Bearer ${params.token}`)
             const session = new HTTPWebRTCSession(url, this.headers)
diff --git a/src/webrtc_session.ts b/src/webrtc_session.ts
index d9b72c99..3cf655d8 100644
--- a/src/webrtc_session.ts
+++ b/src/webrtc_session.ts
@@ -469,10 +469,11 @@ export class HTTPWebRTCSession extends WebRTCSession {
     address: string
     headers: HttpHeaders
     sessionUrl: string | null
+    pendingCandidates: Array<RTCIceCandidate>
     constructor(address: string, headers?: Map<string, string>) {
         super()
         this.address = address
-        this.headers = { "Content-Type": "application/sdp" }
+        this.headers = { "Content-Type": "application/json" }
         if (headers)
             headers.forEach((v, k) => this.headers[k] =  v)
         this.sessionUrl = null
@@ -480,8 +481,9 @@ export class HTTPWebRTCSession extends WebRTCSession {
     }
 
     sendOffer(offer: RTCSessionDescriptionInit) {
-        let headers = this.headers
-        headers['Content-Type'] = 'application/sdp'
+        const headers = this.headers
+        this.pendingCandidates = []
+        headers['Content-Type'] = 'application/json'
         CapacitorHttp.post({
             url: this.address, 
             headers: headers,
@@ -499,7 +501,11 @@ export class HTTPWebRTCSession extends WebRTCSession {
                 else
                     this.fail()
             } else if (response.status == 201) {
-                this.sessionUrl = response.headers['location']
+                this.sessionUrl = response.headers['location'] || response.headers['Location']
+                console.log("got a session url", this.sessionUrl)
+                console.log("waiting candidates", this.pendingCandidates.length)
+                this.pendingCandidates.forEach(c => this.sendCandidate(c))
+                this.pendingCandidates = []
                 return response.data
             }
             return null
@@ -507,12 +513,10 @@ export class HTTPWebRTCSession extends WebRTCSession {
             if (!data)
                 return
             // TODO move this to the last line of the last then
-            const answer = data
-            const sd = new RTCSessionDescription(answer)
+
             if (this.pc)
-                this.pc.setRemoteDescription(sd).catch (() => { 
-                    this.fail(Failure.BadRemoteDescription)
-                })
+                this.pc.setRemoteDescription({type: "answer", sdp: data})
+                    .catch (() => this.fail(Failure.BadRemoteDescription))
         }).catch(error => {
             console.log(`FAILED: POST to ${this.address} with ${JSON.stringify(this.headers)}`, error)
             if (error.message == 'unauthorized')
@@ -528,13 +532,18 @@ export class HTTPWebRTCSession extends WebRTCSession {
             this.sendOffer(offer)
         })
     }
-    sendCandidate(fp: string, ev: RTCPeerConnectionIceEvent) {
+    sendCandidate(candidate: RTCIceCandidate) {
+        if (this.sessionUrl == null) {
+            console.log("waiting for session url, queuing candidate")
+            this.pendingCandidates.push(candidate)
+            return
+        }
         CapacitorHttp.patch({
             url: this.sessionUrl, 
             headers: this.headers,
             readTimeout: 3000,
             connectTimeout: 3000,
-            data: ev.candidate,
+            data: candidate.toJSON(),
             // webFetchExtra: { mode: 'no-cors' }
         }).then(response => {
             if (response.status == 401)
@@ -548,18 +557,8 @@ export class HTTPWebRTCSession extends WebRTCSession {
             } else
                 return response.data
             return null
-        }).then(data => {
-            if (!data)
-                return
-            // TODO move this to the last line of the last then
-            const answer = JSON.parse(atob(data))
-            const sd = new RTCSessionDescription(answer)
-            if (this.pc)
-                this.pc.setRemoteDescription(sd).catch (() => { 
-                    this.fail(Failure.BadRemoteDescription)
-                })
         }).catch(error => {
-            console.log(`FAILED: POST to ${this.address} with ${JSON.stringify(this.headers)}`, error)
+            console.log(`FAILED: PATCH to ${this.address} with ${JSON.stringify(this.headers)}`, error)
             if (error.message == 'unauthorized')
                 this.fail(Failure.Unauthorized)
             else
@@ -569,20 +568,22 @@ export class HTTPWebRTCSession extends WebRTCSession {
     onIceCandidate(ev: RTCPeerConnectionIceEvent) {
         console.log("got ice candidate", ev)
         if (ev.candidate == null) {
+            if ((this.sessionUrl != null) && (this.pendingCandidates.length == 0)) {
             // DELETE the session
-            CapacitorHttp.delete({
-                url: this.sessionUrl,
-                readTimeout: 3000,
-                connectTimeout: 3000,
-            })
+                CapacitorHttp.delete({
+                    url: this.sessionUrl,
+                    readTimeout: 3000,
+                    connectTimeout: 3000,
+                })
+                this.sessionURL = null
+            }
+            else
+                setTimeout(() => this.onIceCandidate(new RTCPeerConnectionIceEvent("candidate", {candidate: null})), 1000)
             return
         }
-        this.t7.getFingerprint().then(fp => {
-            this.sendCandidate(fp, ev)
-        })
+        this.sendCandidate(ev.candidate)
     }
     isOpen(): boolean {
         return this.pc != null && this.pc.connectionState == "connected"
     }
 }
-

From c6d23aaad11af3f5528d38f9714faa2c953f8117 Mon Sep 17 00:00:00 2001
From: Benny Daon <benny@tuzig.com>
Date: Tue, 7 Nov 2023 14:29:43 +0200
Subject: [PATCH 30/53] Improving test stability

---
 aatp/ui/ui.spec.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/aatp/ui/ui.spec.ts b/aatp/ui/ui.spec.ts
index 776f9937..04b8b95d 100644
--- a/aatp/ui/ui.spec.ts
+++ b/aatp/ui/ui.spec.ts
@@ -99,6 +99,9 @@ insecure=true`)
         await page.reload({waitUntil: "networkidle"})
         await page.evaluate(async () => {
             window.notifications = []
+            while (!window.terminal7) {
+                await new Promise(r => setTimeout(r, 100))
+            }
             window.terminal7.notify = (m) => window.notifications.push(m)
         })
         await connectFirstGate(page)

From a5e3fb77ad99cfa33659e58ed3b9f8140bfa98e9 Mon Sep 17 00:00:00 2001
From: Benny Daon <benny@tuzig.com>
Date: Tue, 7 Nov 2023 14:31:16 +0200
Subject: [PATCH 31/53] Catching errors

---
 src/peerbook.ts       | 13 +++++--------
 src/webrtc_session.ts | 15 ++++++++++-----
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/peerbook.ts b/src/peerbook.ts
index b8de29fa..915a67b8 100644
--- a/src/peerbook.ts
+++ b/src/peerbook.ts
@@ -69,13 +69,7 @@ export class PeerbookConnection {
     async adminCommand(msg: unknown): Promise<string> {
         if (!this.session) {
             console.log("Admin command with no session")
-            try {
-                await this.connect({firstMsg: msg})
-            } catch (e) {
-                console.log("Failed to connect to peerbook", e)
-                throw new Error("Failed to connect")
-            }
-            return ""
+            await this.connect({firstMsg: msg})
         }   
         return new Promise((resolve, reject) => {
             this.session.sendCTRLMsg(msg, resolve, reject)
@@ -303,7 +297,10 @@ export class PeerbookConnection {
                 }
             }
             session.onCMD = (msg) => this.onMessage(msg)
-            session.connect()
+            session.connect().catch(e => {
+                console.log("Failed to connect", e)
+                reject(e)
+            })
         })
     }
     close() {
diff --git a/src/webrtc_session.ts b/src/webrtc_session.ts
index 3cf655d8..05376a45 100644
--- a/src/webrtc_session.ts
+++ b/src/webrtc_session.ts
@@ -418,11 +418,16 @@ export class PeerbookSession extends WebRTCSession {
     }
     onIceCandidate(ev: RTCPeerConnectionIceEvent) {
         if (ev.candidate && this.t7.pb) {
-            this.t7.pb.adminCommand({type: "candidate",
-                                     args: {
-                                         target: this.fp,
-                                         sdp: ev.candidate
-                                    }})
+            try {
+                this.t7.pb.adminCommand({type: "candidate",
+                                         args: {
+                                             target: this.fp,
+                                             sdp: ev.candidate
+                                        }})
+            } catch(e) {
+                terminal7.log("failed to send candidate", e)
+                terminal7.notify("Failed to connect, please try again")
+            }
         } else {
             terminal7.log("ignoring ice candidate", JSON.stringify(ev.candidate))
         }

From 8b3b53e1a19bd0041137052b9efe94ca43939fc6 Mon Sep 17 00:00:00 2001
From: Benny Daon <benny@tuzig.com>
Date: Tue, 7 Nov 2023 14:32:35 +0200
Subject: [PATCH 32/53] Fixing WHIP resource delete

---
 src/webrtc_session.ts | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/webrtc_session.ts b/src/webrtc_session.ts
index 05376a45..3b28c2e9 100644
--- a/src/webrtc_session.ts
+++ b/src/webrtc_session.ts
@@ -475,6 +475,8 @@ export class HTTPWebRTCSession extends WebRTCSession {
     headers: HttpHeaders
     sessionUrl: string | null
     pendingCandidates: Array<RTCIceCandidate>
+    // storing the setTimeout id so we can cancel it
+    retryDelete: number | null = null
     constructor(address: string, headers?: Map<string, string>) {
         super()
         this.address = address
@@ -581,9 +583,14 @@ export class HTTPWebRTCSession extends WebRTCSession {
                     connectTimeout: 3000,
                 })
                 this.sessionURL = null
+                // cancel the retry
+                if (this.retryDelete) {
+                    clearTimeout(this.retryDelete)
+                    this.retryDelete = null
+                }
             }
             else
-                setTimeout(() => this.onIceCandidate(new RTCPeerConnectionIceEvent("candidate", {candidate: null})), 1000)
+                this.retryDelete = setTimeout(() => this.onIceCandidate(new RTCPeerConnectionIceEvent("candidate", {candidate: null})), 1000)
             return
         }
         this.sendCandidate(ev.candidate)
@@ -591,4 +598,16 @@ export class HTTPWebRTCSession extends WebRTCSession {
     isOpen(): boolean {
         return this.pc != null && this.pc.connectionState == "connected"
     }
+    close(): void {
+        clearTimeout(this.retryDelete)
+        super.close()
+        if (this.sessionUrl != null) {
+            CapacitorHttp.delete({
+                url: this.sessionUrl,
+                readTimeout: 3000,
+                connectTimeout: 3000,
+            })
+            this.sessionURL = null
+        }
+    }
 }

From 003e15611b0c569e2b008588d690c675a4d388f0 Mon Sep 17 00:00:00 2001
From: Benny Daon <benny@tuzig.com>
Date: Wed, 8 Nov 2023 11:42:20 +0200
Subject: [PATCH 33/53] Fixing ignoreAppEvents

---
 src/commands.ts  |  8 ++++++--
 src/gate.ts      | 13 +++++--------
 src/peerbook.ts  | 10 +++++-----
 src/terminal7.ts | 20 +++++++-------------
 4 files changed, 23 insertions(+), 28 deletions(-)

diff --git a/src/commands.ts b/src/commands.ts
index b45d260d..f8aacbf4 100644
--- a/src/commands.ts
+++ b/src/commands.ts
@@ -300,9 +300,11 @@ async function connectCMD(shell:Shell, args: string[]) {
         })
         done = true
     })
+    terminal7.ignoreAppEvents = true
     while (!done) {
         await new Promise(r => setTimeout(r, 100))
     }
+    terminal7.ignoreAppEvents = false
 }
 
 async function addCMD(shell: Shell) {
@@ -660,13 +662,15 @@ async function subscribeCMD(shell: Shell) {
             terminal7.ignoreAppEvents = true
             try {
                 await terminal7.pb.purchase(p.p)
-                shell.stopWatchdog()
             } catch(e) {
-                shell.stopWatchdog()
                 console.log("purchase error", e)
                 shell.t.writeln("Error purchasing, please try again or `support`")
                 return
+            } finally {
+                terminal7.ignoreAppEvents = false
+                shell.stopWatchdog()
             }
+
         }
     }
     if (!terminal7.pb.isOpen()) {
diff --git a/src/gate.ts b/src/gate.ts
index b6e6b460..af8918dd 100644
--- a/src/gate.ts
+++ b/src/gate.ts
@@ -222,7 +222,6 @@ export class Gate {
         this.stopBoarding()
         this.map.shell.stopWatchdog()
         let password: string
-        let firstGate: string | null
         switch ( failure ) {
             case Failure.WrongPassword:
                 this.notify("Sorry, wrong password")
@@ -280,9 +279,6 @@ export class Gate {
                     this.onFailure(Failure.Aborted)
                     return 
                 }
-                firstGate = (await Preferences.get({key: "first_gate"})).value
-                if (firstGate)
-                    terminal7.ignoreAppEvents = true
                 const session = this.session as SSHSession
                 session.passConnect(this.marker, password)
                 return
@@ -642,6 +638,11 @@ export class Gate {
                 resolve()
             }).catch(() => {
                 resolve()
+                /*
+            }).finally(() => {
+                this.session.close()
+                this.session = null
+                */
             })
         })
     }
@@ -714,10 +715,6 @@ export class Gate {
             if (this.session.isSSH) {
                 try {
                     const {publicKey, privateKey} = await this.t7.readId()
-                    const firstGate = (await Preferences.get({key: "first_gate"})).value
-                    if (firstGate)
-                        terminal7.ignoreAppEvents = true
-
                     const session = this.session as SSHSession
                     await session.connect(this.marker, publicKey, privateKey)
                 } catch(e) {
diff --git a/src/peerbook.ts b/src/peerbook.ts
index 915a67b8..de266ce9 100644
--- a/src/peerbook.ts
+++ b/src/peerbook.ts
@@ -67,12 +67,12 @@ export class PeerbookConnection {
     }
 
     async adminCommand(msg: unknown): Promise<string> {
-        if (!this.session) {
-            console.log("Admin command with no session")
-            await this.connect({firstMsg: msg})
-        }   
         return new Promise((resolve, reject) => {
-            this.session.sendCTRLMsg(msg, resolve, reject)
+            if (!this.session) {
+                console.log("Admin command with no session")
+                this.connect({firstMsg: msg}).then(resolve).catch(reject)
+            } else
+                this.session.sendCTRLMsg(msg, resolve, reject)
         })
     }
 
diff --git a/src/terminal7.ts b/src/terminal7.ts
index 324eca2b..d26a93a7 100644
--- a/src/terminal7.ts
+++ b/src/terminal7.ts
@@ -212,19 +212,15 @@ export class Terminal7 {
         }
         this.lastActiveState = active
         this.log("app state changed", this.ignoreAppEvents)
+        if (this.ignoreAppEvents) {
+            terminal7.log("ignoring benched app event")
+            return
+        }
         if (!active) {
-            if (this.ignoreAppEvents) {
-                terminal7.log("ignoring benched app event")
-                return
-            }
             this.updateNetworkStatus({connected: false}, false)
         } else {
             // We're back! puts us in recovery mode so that it'll
             // quietly reconnect to the active gate on failure
-            if (this.ignoreAppEvents) {
-                this.ignoreAppEvents = false
-                return
-            }
             this.clearTimeouts()
             Network.getStatus().then(s => this.updateNetworkStatus(s))
         }
@@ -1068,8 +1064,8 @@ export class Terminal7 {
         const now = Date.now()
         if (this.keys && (now - this.lastIdVerify  < this.conf.ui.verificationTTL))
             return this.keys
-        this.ignoreAppEvents = true
         let verified
+        this.ignoreAppEvents = true
         try {
             verified = await NativeBiometric.verifyIdentity({
                 reason: "Use private key to connect",
@@ -1077,14 +1073,12 @@ export class Terminal7 {
             })
         } catch(e) {
             this.notify(`Biometric failed: ${e.message}`)
-            this.ignoreAppEvents = false
             throw "Biometric failed: " + e.message
+        } finally {
+            this.ignoreAppEvents = false
         }
         console.log("Got biometric verified ", verified)
         this.lastActiveState = false
-        // wait for the app events to bring the ignoreAppEvents to false
-        while (this.ignoreAppEvents)
-            await (() => { return new Promise(r => setTimeout(r, 50)) })()
 
         let publicKey
         let privateKey

From 0d6ae130cdb6e3b284d9e9bda2a49ff4bed3d6eb Mon Sep 17 00:00:00 2001
From: Benny Daon <benny@tuzig.com>
Date: Wed, 8 Nov 2023 11:42:41 +0200
Subject: [PATCH 34/53] updating the tests

---
 aatp/infra/webexec/docker_entry.sh | 2 +-
 aatp/peerbook_webrtc/lab.yaml      | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/aatp/infra/webexec/docker_entry.sh b/aatp/infra/webexec/docker_entry.sh
index 25bbac06..8e00b37c 100644
--- a/aatp/infra/webexec/docker_entry.sh
+++ b/aatp/infra/webexec/docker_entry.sh
@@ -19,8 +19,8 @@ if [[ $PEERBOOK == "1" ]]
 then
     /scripts/wait-for-it.sh -h peerbook -p 17777
 fi
+trap 'break' SIGTERM
 while true
-env 
 do
     su - runner -c "WEBEXEC_SERVER_URL=$WEBEXEC_SERVER_URL /usr/local/bin/webexec start --debug"
 done
diff --git a/aatp/peerbook_webrtc/lab.yaml b/aatp/peerbook_webrtc/lab.yaml
index 5569d94f..fe4359b9 100644
--- a/aatp/peerbook_webrtc/lab.yaml
+++ b/aatp/peerbook_webrtc/lab.yaml
@@ -52,6 +52,7 @@ services:
       PB_SMTP_HOST: smtp
       PB_SMTP_PORT: 1025
       PB_HOME_URL: http://peerbook:17777
+      WEBEXEC_SERVER_URL: http://peerbook:17777
   redis:
     build:
       context: .

From 360ef3613e05c78a6bc911670c629bc116eaa734 Mon Sep 17 00:00:00 2001
From: Benny Daon <benny@tuzig.com>
Date: Wed, 8 Nov 2023 12:08:02 +0200
Subject: [PATCH 35/53] Improving notifications & prompt

---
 src/gate.ts      | 15 +++++++--------
 src/terminal7.ts |  1 +
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/gate.ts b/src/gate.ts
index af8918dd..8595362a 100644
--- a/src/gate.ts
+++ b/src/gate.ts
@@ -638,11 +638,6 @@ export class Gate {
                 resolve()
             }).catch(() => {
                 resolve()
-                /*
-            }).finally(() => {
-                this.session.close()
-                this.session = null
-                */
             })
         })
     }
@@ -680,11 +675,15 @@ export class Gate {
         const isNative = Capacitor.isNativePlatform()
         const overPB = this.fp && !this.onlySSH && this.online
         if (overPB) {
+            this.notify("🎌  PeerBook")
             if (!terminal7.pb.isOpen()) {
-                this.notify(`${PB} Connecting`)
-                await terminal7.pbConnect()
+                try {
+                    await terminal7.pbConnect()
+                } catch(e) {
+                    this.notify(`${PB} Connection failed: ${e}`)
+                    return
+                }
             }
-            this.notify("🎌  PeerBook")
             this.session = new PeerbookSession(this.fp)
         } else {
             if (isNative)  {
diff --git a/src/terminal7.ts b/src/terminal7.ts
index d26a93a7..213f6151 100644
--- a/src/terminal7.ts
+++ b/src/terminal7.ts
@@ -656,6 +656,7 @@ export class Terminal7 {
                             .finally(() =>  {
                                 this.recovering = false
                                 this.map.shell.stopWatchdog()
+                                this.map.shell.printPrompt()
                             })
                     }
                 })

From 4a4d6638ae0d233b28a9ea16e9c65d5e964c3448 Mon Sep 17 00:00:00 2001
From: Benny Daon <benny@tuzig.com>
Date: Wed, 8 Nov 2023 12:53:58 +0200
Subject: [PATCH 36/53] Improving reset

---
 src/commands.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/commands.ts b/src/commands.ts
index f8aacbf4..94096520 100644
--- a/src/commands.ts
+++ b/src/commands.ts
@@ -335,6 +335,8 @@ async function addCMD(shell: Shell) {
 }
 
 async function resetCMD(shell: Shell, args: string[]) {
+    terminal7.recovering = false
+    terminal7.ignoreAppEvents = false
     let gate: Gate
     if (args[0]) {
         gate = shell.getGate(args[0])

From 3e044319a59f98e51593916e88f20c29d46af39a Mon Sep 17 00:00:00 2001
From: Benny Daon <benny@tuzig.com>
Date: Wed, 8 Nov 2023 12:54:31 +0200
Subject: [PATCH 37/53] Moving isOpen where it belongs

not that it helps. we need to optimize this, probably
using the disconnect event to reconnect
---
 src/webrtc_session.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/webrtc_session.ts b/src/webrtc_session.ts
index 3b28c2e9..ad7fd910 100644
--- a/src/webrtc_session.ts
+++ b/src/webrtc_session.ts
@@ -165,6 +165,9 @@ export class WebRTCSession extends BaseSession {
             return
         this.openCDC()
     }
+    isOpen(): boolean {
+        return this.pc != null && this.pc.connectionState == "connected"
+    }
 
     // dcOpened is called when a data channel has been opened
     onDCOpened(dc: RTCDataChannel, id: number):  WebRTCChannel {
@@ -224,7 +227,7 @@ export class WebRTCSession extends BaseSession {
     async reconnect(marker?: Marker , publicKey?: string, privateKey?: string): Promise<void> {
         return new Promise((resolve, reject) => { 
             console.log("in reconnect", this.cdc, this.cdc.readyState)
-            if (!this.pc)
+            if (!this.isOpen())
                 return this.connect(marker, publicKey, privateKey)
             
             if (!this.cdc || this.cdc.readyState != "open")
@@ -595,9 +598,6 @@ export class HTTPWebRTCSession extends WebRTCSession {
         }
         this.sendCandidate(ev.candidate)
     }
-    isOpen(): boolean {
-        return this.pc != null && this.pc.connectionState == "connected"
-    }
     close(): void {
         clearTimeout(this.retryDelete)
         super.close()

From bd0f733b92d3fe7baa3500a92085aea99079d4a8 Mon Sep 17 00:00:00 2001
From: Benny Daon <benny@tuzig.com>
Date: Thu, 9 Nov 2023 13:11:54 +0200
Subject: [PATCH 38/53] Sending only sdp when connecting to WHIP

---
 src/webrtc_session.ts | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/webrtc_session.ts b/src/webrtc_session.ts
index ad7fd910..e20416a1 100644
--- a/src/webrtc_session.ts
+++ b/src/webrtc_session.ts
@@ -483,7 +483,7 @@ export class HTTPWebRTCSession extends WebRTCSession {
     constructor(address: string, headers?: Map<string, string>) {
         super()
         this.address = address
-        this.headers = { "Content-Type": "application/json" }
+        this.headers = {}
         if (headers)
             headers.forEach((v, k) => this.headers[k] =  v)
         this.sessionUrl = null
@@ -493,13 +493,13 @@ export class HTTPWebRTCSession extends WebRTCSession {
     sendOffer(offer: RTCSessionDescriptionInit) {
         const headers = this.headers
         this.pendingCandidates = []
-        headers['Content-Type'] = 'application/json'
+        headers['Content-Type'] = 'application/sdp'
         CapacitorHttp.post({
             url: this.address, 
             headers: headers,
             readTimeout: 3000,
             connectTimeout: 3000,
-            data: offer
+            data: offer.sdp,
             // webFetchExtra: { mode: 'no-cors' }
         }).then(response => {
             if (response.status == 401)
@@ -548,9 +548,12 @@ export class HTTPWebRTCSession extends WebRTCSession {
             this.pendingCandidates.push(candidate)
             return
         }
+        const headers = {}
+        Object.assign(headers, this.headers)
+        headers['Content-Type'] = 'application/json'
         CapacitorHttp.patch({
             url: this.sessionUrl, 
-            headers: this.headers,
+            headers: headers,
             readTimeout: 3000,
             connectTimeout: 3000,
             data: candidate.toJSON(),

From 39d4dac03a4cb7560cbb4761895e288c6d40e597 Mon Sep 17 00:00:00 2001
From: Benny Daon <benny@tuzig.com>
Date: Mon, 13 Nov 2023 14:40:11 +0200
Subject: [PATCH 39/53] Simplifying reconnect

---
 src/pane.ts           |  1 +
 src/peerbook.ts       | 30 ++++++++++++++++++++----------
 src/session.ts        |  1 +
 src/terminal7.ts      | 31 +++++++++++++++++++------------
 src/webrtc_session.ts | 38 ++++++++++++++++++++++----------------
 5 files changed, 63 insertions(+), 38 deletions(-)

diff --git a/src/pane.ts b/src/pane.ts
index 75a71eab..c0e27eb8 100644
--- a/src/pane.ts
+++ b/src/pane.ts
@@ -290,6 +290,7 @@ export class Pane extends Cell {
             this.resizeObserver.disconnect()
             this.resizeObserver = null
         }
+        // TODO: recover from zoomedE is null
         const te = this.t7.zoomedE.children[0].children[0]
         this.e.appendChild(te)
         document.body.removeChild(this.t7.zoomedE)
diff --git a/src/peerbook.ts b/src/peerbook.ts
index de266ce9..1e0f5197 100644
--- a/src/peerbook.ts
+++ b/src/peerbook.ts
@@ -12,10 +12,11 @@ import { CustomerInfo } from "@revenuecat/purchases-typescript-internal-esm"
 export const PB = "\uD83D\uDCD6"
 import { Capacitor } from '@capacitor/core'
 import { Device } from '@capacitor/device'
-import { Purchases } from '@revenuecat/purchases-capacitor'
-import { HTTPWebRTCSession } from './webrtc_session'
+import { Failure } from './session'
 import { Gate } from './gate'
+import { HTTPWebRTCSession } from './webrtc_session'
 import { PeerbookSession } from "./webrtc_session"
+import { Purchases } from '@revenuecat/purchases-capacitor'
 import { Shell } from './shell'
 import {OPEN_HTML_SYMBOL} from './terminal7'
 
@@ -66,13 +67,19 @@ export class PeerbookConnection {
         this.uid = ""
     }
 
-    async adminCommand(msg: unknown): Promise<string> {
+    async adminCommand(cmd: unknown): Promise<string> {
         return new Promise((resolve, reject) => {
             if (!this.session) {
-                console.log("Admin command with no session")
-                this.connect({firstMsg: msg}).then(resolve).catch(reject)
+                console.log("Admin command with no session", cmd)
+                this.connect({firstMsg: cmd}).then(() => {
+                    console.log("Connected, resolving")
+                    resolve()
+                }).catch(e => {
+                    console.log("Failed to connect")
+                    reject(e)
+                })
             } else
-                this.session.sendCTRLMsg(msg, resolve, reject)
+                this.session.sendCTRLMsg(cmd, resolve, reject)
         })
     }
 
@@ -277,9 +284,9 @@ export class PeerbookConnection {
                         this.session.close()
                     this.session = null
                     console.log("PB webrtc connection failed", failure, this.uid)
-                    if (failure == "Unauthorized")
+                    if (failure == Failure.Unauthorized) {
                         reject(failure)
-                    else {
+                    } else {
                         if (!params)
                             params = {}
                         if (!params.count)
@@ -303,6 +310,9 @@ export class PeerbookConnection {
             })
         })
     }
+    notify(msg: string) {
+        terminal7.notify(PB + " " + msg)
+    }
     close() {
         if (this.ws) {
             this.ws.onopen = undefined
@@ -431,7 +441,7 @@ export class PeerbookConnection {
                 this.uid = m["text"]
             } else
                 // TODO: update statusE
-                terminal7.notify(`{PB}  ${m["text"]}`)
+                this.notify(`${m["text"]}`)
             return
         }
         if (m["peers"] !== undefined) {
@@ -442,7 +452,7 @@ export class PeerbookConnection {
         // TODO: is this needed?
         if (m["verified"] !== undefined) {
             if (!m["verified"])
-                terminal7.notify(`${PB} Unverified client. Please check you email.`)
+                this.notify(`Unverified client. Please check you email.`)
             return
         }
         const fp = m.source_fp
diff --git a/src/session.ts b/src/session.ts
index a911cae3..e35837eb 100644
--- a/src/session.ts
+++ b/src/session.ts
@@ -23,6 +23,7 @@ export enum Failure {
     DataChannelLost="Data Channel Lost",
     FailedToConnect="Failed To Connect",
     Overrun='Overrun',
+    InternalError='Internal Error',
 }
 
 export interface Event {
diff --git a/src/terminal7.ts b/src/terminal7.ts
index 213f6151..d1671eac 100644
--- a/src/terminal7.ts
+++ b/src/terminal7.ts
@@ -423,6 +423,7 @@ export class Terminal7 {
                     terminal7.pb.stopSpinner()
                 statusE.style.opacity = "1"
                 statusE.innerHTML = symbol
+                console.log("pbConnect failed", e)
                 reject(e)
             }
             const catchConnect = e => {
@@ -648,18 +649,24 @@ export class Terminal7 {
                 })
             } else
                 this.recovering = false
-            this.pbConnect().catch(e => this.log("pbConnect failed", e))
-                .finally(() => {
-                    if (toReconnect) {
-                        gate.reconnect()
-                            .catch(() => this.map.shell.runCommand("reset", [gate.name]))
-                            .finally(() =>  {
-                                this.recovering = false
-                                this.map.shell.stopWatchdog()
-                                this.map.shell.printPrompt()
-                            })
-                    }
-                })
+            if (toReconnect) {
+                try {
+                    await gate.reconnect()
+                } catch(e) {
+                    console.log("recoonect failed", e)
+                    this.map.shell.runCommand("reset", [gate.name])
+                } finally {
+                        this.recovering = false
+                        this.map.shell.stopWatchdog()
+                        this.map.shell.printPrompt()
+                }
+            } else {
+                try {
+                    await this.pbConnect()
+                } catch(e) {
+                    this.log("pbConnect failed", e)
+                }
+            }
         } else {
             this.disengage().finally(() => this.recovering = true)
         }
diff --git a/src/webrtc_session.ts b/src/webrtc_session.ts
index e20416a1..d21d2851 100644
--- a/src/webrtc_session.ts
+++ b/src/webrtc_session.ts
@@ -435,22 +435,27 @@ export class PeerbookSession extends WebRTCSession {
             terminal7.log("ignoring ice candidate", JSON.stringify(ev.candidate))
         }
     }
-    onNegotiationNeeded(e) {
+    async onNegotiationNeeded(e) {
         terminal7.log("on negotiation needed", e)
-        this.pc.createOffer().then(d => {
-            this.pc.setLocalDescription(d)
-            try {
-                terminal7.pb.adminCommand({type: "offer",
-                                          args: {
-                                              target: this.fp,
-                                              sdp: d
-                                          }})
-            } catch(e) {
-                terminal7.log("failed to send offer", e)
-                terminal7.notify("Failed to connect, please try again")
-            }
-
-        })
+        let d: RTCSessionDescriptionInit
+        try {
+            d = await this.pc.createOffer()
+        } catch(e) {
+            terminal7.log("failed to create offer", e)
+            this.onStateChange("failed", Failure.InternalError)
+            return
+        }
+        this.pc.setLocalDescription(d)
+        try {
+            await terminal7.pb.adminCommand({type: "offer",
+                                      args: {
+                                          target: this.fp,
+                                          sdp: d
+                                      }})
+        } catch(e) {
+            terminal7.log("failed to send offer", e)
+            this.onStateChange("failed", e)
+        }
     }
     peerAnswer(offer) {
         const sd = new RTCSessionDescription(offer)
@@ -581,8 +586,8 @@ export class HTTPWebRTCSession extends WebRTCSession {
     onIceCandidate(ev: RTCPeerConnectionIceEvent) {
         console.log("got ice candidate", ev)
         if (ev.candidate == null) {
+            /*TODO: DELETE the session
             if ((this.sessionUrl != null) && (this.pendingCandidates.length == 0)) {
-            // DELETE the session
                 CapacitorHttp.delete({
                     url: this.sessionUrl,
                     readTimeout: 3000,
@@ -597,6 +602,7 @@ export class HTTPWebRTCSession extends WebRTCSession {
             }
             else
                 this.retryDelete = setTimeout(() => this.onIceCandidate(new RTCPeerConnectionIceEvent("candidate", {candidate: null})), 1000)
+                */
             return
         }
         this.sendCandidate(ev.candidate)

From 6613e5a214463f375cfabe20319cc7de1c9f5ac0 Mon Sep 17 00:00:00 2001
From: Benny Daon <benny@tuzig.com>
Date: Mon, 13 Nov 2023 17:20:56 +0200
Subject: [PATCH 40/53] Fixing the peerbook aatp

---
 aatp/peerbook_webrtc/lab.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/aatp/peerbook_webrtc/lab.yaml b/aatp/peerbook_webrtc/lab.yaml
index fe4359b9..40bec960 100644
--- a/aatp/peerbook_webrtc/lab.yaml
+++ b/aatp/peerbook_webrtc/lab.yaml
@@ -30,6 +30,7 @@ services:
         REF: ${WEBEXEC_REF-master}
     environment:
       PEERBOOK: 1
+      WEBEXEC_SERVER_URL: http://webexec:7777
     depends_on:
       - peerbook
     volumes:

From 4ff8c1994c7c5e3581dbc938ef395356e6ce1789 Mon Sep 17 00:00:00 2001
From: Benny Daon <benny@tuzig.com>
Date: Mon, 13 Nov 2023 18:46:05 +0200
Subject: [PATCH 41/53] WIP: optimizing reconnect

---
 ios/App/App.xcodeproj/project.pbxproj |   4 +-
 ios/App/Podfile.lock                  |  18 +-
 package.json                          |   1 +
 src/gate.ts                           |   4 +
 src/terminal7.ts                      |   2 +-
 yarn.lock                             | 860 +++++++++++++-------------
 6 files changed, 442 insertions(+), 447 deletions(-)

diff --git a/ios/App/App.xcodeproj/project.pbxproj b/ios/App/App.xcodeproj/project.pbxproj
index 8c389fa9..25169239 100644
--- a/ios/App/App.xcodeproj/project.pbxproj
+++ b/ios/App/App.xcodeproj/project.pbxproj
@@ -308,7 +308,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -359,7 +359,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_COMPILATION_MODE = wholemodule;
diff --git a/ios/App/Podfile.lock b/ios/App/Podfile.lock
index 7d930bb3..6469c67c 100644
--- a/ios/App/Podfile.lock
+++ b/ios/App/Podfile.lock
@@ -28,12 +28,12 @@ PODS:
   - CapacitorStatusBar (5.0.6):
     - Capacitor
   - NMSSHT7 (2.9.1)
-  - PurchasesHybridCommon (7.0.0):
-    - RevenueCat (= 4.27.0)
-  - RevenueCat (4.27.0)
-  - RevenuecatPurchasesCapacitor (7.0.0):
+  - PurchasesHybridCommon (7.3.0):
+    - RevenueCat (= 4.30.2)
+  - RevenueCat (4.30.2)
+  - RevenuecatPurchasesCapacitor (7.1.0):
     - Capacitor
-    - PurchasesHybridCommon (= 7.0.0)
+    - PurchasesHybridCommon (= 7.3.0)
 
 DEPENDENCIES:
   - "Capacitor (from `../../node_modules/@capacitor/ios`)"
@@ -106,10 +106,10 @@ SPEC CHECKSUMS:
   CapacitorSshPlugin: 79f67cb26d40bd0c07cec6dda93d93d5faf7b614
   CapacitorStatusBar: 565c0a1ebd79bb40d797606a8992b4a105885309
   NMSSHT7: 67f9d8f43b40b997728761b4cf2aa7ea660ba7c2
-  PurchasesHybridCommon: af3b2413f9cb999bc1fdca44770bdaf39dfb89fa
-  RevenueCat: 84fbe2eb9bbf63e1abf346ccd3ff9ee45d633e3b
-  RevenuecatPurchasesCapacitor: c0de310959a58b3217acd7ec5ce981175bb050b1
+  PurchasesHybridCommon: a3101e0f94de9bf872a67a6511ecaa932fdef02e
+  RevenueCat: bedd1226d8081830838fb492603cc96349a24f34
+  RevenuecatPurchasesCapacitor: cf268ba90377d12f49e6b003244a0c0fa87b1a80
 
 PODFILE CHECKSUM: b1f79f7d62e59482e73924f44c49c50186ac72be
 
-COCOAPODS: 1.11.3
+COCOAPODS: 1.12.1
diff --git a/package.json b/package.json
index 7294877b..8f8eed74 100644
--- a/package.json
+++ b/package.json
@@ -53,6 +53,7 @@
   },
   "devDependencies": {
     "@capacitor/assets": "^2.0.4",
+    "native-run": "^1.7.4",
     "@playwright/test": "^1.20.1",
     "@types/hammerjs": "^2.0.42",
     "@types/xterm": "^3.0.0",
diff --git a/src/gate.ts b/src/gate.ts
index 8595362a..366eb0aa 100644
--- a/src/gate.ts
+++ b/src/gate.ts
@@ -194,10 +194,12 @@ export class Gate {
                 const session = this.session as WebRTCSession
                 session.msgHandlers.forEach(v => v[1]("Disconnected"))
                 setTimeout(() => this.reconnect(), 10)
+                terminal7.recovering = false
                 return
             }
         } else if (state == "failed")  {
             if (terminal7.recovering)  {
+                terminal7.recovering = false
                 terminal7.log("failure while recovering")
                 if (this.session?.isSSH) { // if ssh, try again
                     setTimeout(() => this.completeConnect(), 100)
@@ -340,8 +342,10 @@ export class Gate {
      */
     async connect(onConnected = () => this.load()) {
         
+        /*
         if (!terminal7.netConnected)
             return
+            */
         this.onConnected = onConnected
         this.t7.activeG = this // TODO: move this out of here
         this.connectionFailed = false
diff --git a/src/terminal7.ts b/src/terminal7.ts
index d1671eac..c041de09 100644
--- a/src/terminal7.ts
+++ b/src/terminal7.ts
@@ -634,7 +634,7 @@ export class Terminal7 {
                 off.add("hidden")
             const gate = this.activeG
             const firstGate = (await Preferences.get({key: "first_gate"})).value
-            const toReconnect = gate && gate.boarding && (firstGate == "nope")
+            const toReconnect = gate && gate.boarding && (firstGate == "nope") && this.recovering
             console.log("toReconnect", toReconnect, "firstGate", firstGate)
             if (toReconnect ) {
                 this.notify("🌞 Recovering")
diff --git a/yarn.lock b/yarn.lock
index 6e3c0072..95530d0f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -32,38 +32,38 @@
     "@babel/highlight" "^7.22.13"
     chalk "^2.4.2"
 
-"@babel/compat-data@^7.22.6", "@babel/compat-data@^7.22.9", "@babel/compat-data@^7.23.2":
-  version "7.23.2"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.23.2.tgz#6a12ced93455827037bfb5ed8492820d60fc32cc"
-  integrity sha512-0S9TQMmDHlqAZ2ITT95irXKfxN9bncq8ZCoJhun3nHL/lLUxd2NKBJYoNGWH7S0hz6fRQwWlAWn/ILM0C70KZQ==
+"@babel/compat-data@^7.22.6", "@babel/compat-data@^7.22.9", "@babel/compat-data@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.23.3.tgz#3febd552541e62b5e883a25eb3effd7c7379db11"
+  integrity sha512-BmR4bWbDIoFJmJ9z2cZ8Gmm2MXgEDgjdWgpKmKWUt54UGFJdlj31ECtbaDvCG/qVdG3AQ1SfpZEs01lUFbzLOQ==
 
 "@babel/core@^7.11.1":
-  version "7.23.2"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.23.2.tgz#ed10df0d580fff67c5f3ee70fd22e2e4c90a9f94"
-  integrity sha512-n7s51eWdaWZ3vGT2tD4T7J6eJs3QoBXydv7vkUM06Bf1cbVD2Kc2UrkzhiQwobfV7NwOnQXYL7UBJ5VPU+RGoQ==
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.23.3.tgz#5ec09c8803b91f51cc887dedc2654a35852849c9"
+  integrity sha512-Jg+msLuNuCJDyBvFv5+OKOUjWMZgd85bKjbICd3zWrKAo+bJ49HJufi7CQE0q0uR8NGyO6xkCACScNqyjHSZew==
   dependencies:
     "@ampproject/remapping" "^2.2.0"
     "@babel/code-frame" "^7.22.13"
-    "@babel/generator" "^7.23.0"
+    "@babel/generator" "^7.23.3"
     "@babel/helper-compilation-targets" "^7.22.15"
-    "@babel/helper-module-transforms" "^7.23.0"
+    "@babel/helper-module-transforms" "^7.23.3"
     "@babel/helpers" "^7.23.2"
-    "@babel/parser" "^7.23.0"
+    "@babel/parser" "^7.23.3"
     "@babel/template" "^7.22.15"
-    "@babel/traverse" "^7.23.2"
-    "@babel/types" "^7.23.0"
+    "@babel/traverse" "^7.23.3"
+    "@babel/types" "^7.23.3"
     convert-source-map "^2.0.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
     json5 "^2.2.3"
     semver "^6.3.1"
 
-"@babel/generator@^7.23.0":
-  version "7.23.0"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.0.tgz#df5c386e2218be505b34837acbcb874d7a983420"
-  integrity sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==
+"@babel/generator@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.3.tgz#86e6e83d95903fbe7613f448613b8b319f330a8e"
+  integrity sha512-keeZWAV4LU3tW0qRi19HRpabC/ilM0HRBBzf9/k8FFiG4KVpiv0FIy4hHfLfFQZNhziCTPTmd59zoyv6DNISzg==
   dependencies:
-    "@babel/types" "^7.23.0"
+    "@babel/types" "^7.23.3"
     "@jridgewell/gen-mapping" "^0.3.2"
     "@jridgewell/trace-mapping" "^0.3.17"
     jsesc "^2.5.1"
@@ -75,14 +75,14 @@
   dependencies:
     "@babel/types" "^7.22.5"
 
-"@babel/helper-builder-binary-assignment-operator-visitor@^7.22.5":
+"@babel/helper-builder-binary-assignment-operator-visitor@^7.22.15":
   version "7.22.15"
   resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.15.tgz#5426b109cf3ad47b91120f8328d8ab1be8b0b956"
   integrity sha512-QkBXwGgaoC2GtGZRoma6kv7Szfv06khvhFav67ZExau2RaXzy8MpHSMO2PNoP2XtmQphJQRHFfg77Bq731Yizw==
   dependencies:
     "@babel/types" "^7.22.15"
 
-"@babel/helper-compilation-targets@^7.22.15", "@babel/helper-compilation-targets@^7.22.5", "@babel/helper-compilation-targets@^7.22.6":
+"@babel/helper-compilation-targets@^7.22.15", "@babel/helper-compilation-targets@^7.22.6":
   version "7.22.15"
   resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.15.tgz#0698fc44551a26cf29f18d4662d5bf545a6cfc52"
   integrity sha512-y6EEzULok0Qvz8yyLkCvVX+02ic+By2UdOhylwUOvOn9dvYc9mKICJuuU1n1XBI02YWsNsnrY1kc6DVbjcXbtw==
@@ -93,7 +93,7 @@
     lru-cache "^5.1.1"
     semver "^6.3.1"
 
-"@babel/helper-create-class-features-plugin@^7.22.11", "@babel/helper-create-class-features-plugin@^7.22.5":
+"@babel/helper-create-class-features-plugin@^7.22.15":
   version "7.22.15"
   resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.15.tgz#97a61b385e57fe458496fad19f8e63b63c867de4"
   integrity sha512-jKkwA59IXcvSaiK2UN45kKwSC9o+KuoXsBDvHvU/7BecYIp8GQ2UwrVvFgJASUT+hBnwJx6MhvMCuMzwZZ7jlg==
@@ -108,7 +108,7 @@
     "@babel/helper-split-export-declaration" "^7.22.6"
     semver "^6.3.1"
 
-"@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.22.5":
+"@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.22.15", "@babel/helper-create-regexp-features-plugin@^7.22.5":
   version "7.22.15"
   resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.15.tgz#5ee90093914ea09639b01c711db0d6775e558be1"
   integrity sha512-29FkPLFjn4TPEa3RE7GpW+qbE8tlsu3jntNYNfcGsc49LphF1PQIiD+vMZ1z1xVOKt+93khA9tc2JBs3kBjA7w==
@@ -155,17 +155,17 @@
   dependencies:
     "@babel/types" "^7.23.0"
 
-"@babel/helper-module-imports@^7.10.4", "@babel/helper-module-imports@^7.22.15", "@babel/helper-module-imports@^7.22.5":
+"@babel/helper-module-imports@^7.10.4", "@babel/helper-module-imports@^7.22.15":
   version "7.22.15"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz#16146307acdc40cc00c3b2c647713076464bdbf0"
   integrity sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==
   dependencies:
     "@babel/types" "^7.22.15"
 
-"@babel/helper-module-transforms@^7.22.5", "@babel/helper-module-transforms@^7.23.0":
-  version "7.23.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.23.0.tgz#3ec246457f6c842c0aee62a01f60739906f7047e"
-  integrity sha512-WhDWw1tdrlT0gMgUJSlX0IQvoO1eN279zrAUbVB+KpV2c3Tylz8+GnKOLllCS6Z/iZQEyVYxhZVUdPTqs2YYPw==
+"@babel/helper-module-transforms@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz#d7d12c3c5d30af5b3c0fcab2a6d5217773e2d0f1"
+  integrity sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==
   dependencies:
     "@babel/helper-environment-visitor" "^7.22.20"
     "@babel/helper-module-imports" "^7.22.15"
@@ -185,7 +185,7 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz#dd7ee3735e8a313b9f7b05a773d892e88e6d7295"
   integrity sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==
 
-"@babel/helper-remap-async-to-generator@^7.22.20", "@babel/helper-remap-async-to-generator@^7.22.5":
+"@babel/helper-remap-async-to-generator@^7.22.20":
   version "7.22.20"
   resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.20.tgz#7b68e1cb4fa964d2996fd063723fb48eca8498e0"
   integrity sha512-pBGyV4uBqOns+0UvhsTO8qgl8hO89PmiDYv+/COyp1aeMcmfrfruz+/nCMFiYyFF/Knn0yfrC85ZzNFjembFTw==
@@ -194,7 +194,7 @@
     "@babel/helper-environment-visitor" "^7.22.20"
     "@babel/helper-wrap-function" "^7.22.20"
 
-"@babel/helper-replace-supers@^7.22.5", "@babel/helper-replace-supers@^7.22.9":
+"@babel/helper-replace-supers@^7.22.20", "@babel/helper-replace-supers@^7.22.9":
   version "7.22.20"
   resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.22.20.tgz#e37d367123ca98fe455a9887734ed2e16eb7a793"
   integrity sha512-qsW0In3dbwQUbK8kejJ4R7IHVGwHJlV6lpG6UA7a9hSa2YEiAib+N1T2kr6PEeUT+Fl7najmSOS6SmAwCHK6Tw==
@@ -266,26 +266,34 @@
     chalk "^2.4.2"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.22.15", "@babel/parser@^7.23.0":
-  version "7.23.0"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.0.tgz#da950e622420bf96ca0d0f2909cdddac3acd8719"
-  integrity sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==
+"@babel/parser@^7.22.15", "@babel/parser@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.3.tgz#0ce0be31a4ca4f1884b5786057cadcb6c3be58f9"
+  integrity sha512-uVsWNvlVsIninV2prNz/3lHCb+5CJ+e+IUBfbjToAHODtfGYLfCFuY4AU7TskI+dAKk+njsPiBjq1gKTvZOBaw==
 
-"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.22.15":
-  version "7.22.15"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.15.tgz#02dc8a03f613ed5fdc29fb2f728397c78146c962"
-  integrity sha512-FB9iYlz7rURmRJyXRKEnalYPPdn87H5no108cyuQQyMwlpJ2SJtpIUBI27kdTin956pz+LPypkPVPUTlxOmrsg==
+"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.23.3.tgz#5cd1c87ba9380d0afb78469292c954fee5d2411a"
+  integrity sha512-iRkKcCqb7iGnq9+3G6rZ+Ciz5VywC4XNRHe57lKM+jOeYAoR0lVqdeeDRfh0tQcTfw/+vBhHn926FmQhLtlFLQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.22.15":
-  version "7.22.15"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.15.tgz#2aeb91d337d4e1a1e7ce85b76a37f5301781200f"
-  integrity sha512-Hyph9LseGvAeeXzikV88bczhsrLrIZqDPxO+sSmAunMPaGrBGhfMWzCPYTtiW9t+HzSE2wtV8e5cc5P6r1xMDQ==
+"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.23.3.tgz#f6652bb16b94f8f9c20c50941e16e9756898dc5d"
+  integrity sha512-WwlxbfMNdVEpQjZmK5mhm7oSwD3dS6eU+Iwsi4Knl9wAletWem7kaRsGOG+8UEbRyqxY4SS5zvtfXwX+jMxUwQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
-    "@babel/plugin-transform-optional-chaining" "^7.22.15"
+    "@babel/plugin-transform-optional-chaining" "^7.23.3"
+
+"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.23.3.tgz#20c60d4639d18f7da8602548512e9d3a4c8d7098"
+  integrity sha512-XaJak1qcityzrX0/IU5nKHb34VaibwP3saKqG6a/tppelgllOH13LUann4ZCIBcVOeE6H18K4Vx9QKkVww3z/w==
+  dependencies:
+    "@babel/helper-environment-visitor" "^7.22.20"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
 "@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2":
   version "7.21.0-placeholder-for-preset-env.2"
@@ -327,17 +335,17 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-syntax-import-assertions@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.22.5.tgz#07d252e2aa0bc6125567f742cd58619cb14dce98"
-  integrity sha512-rdV97N7KqsRzeNGoWUOK6yUsWarLjE5Su/Snk9IYPU9CwkWHs4t+rTGOvffTR8XGkJMTAdLfO0xVnXm8wugIJg==
+"@babel/plugin-syntax-import-assertions@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.23.3.tgz#9c05a7f592982aff1a2768260ad84bcd3f0c77fc"
+  integrity sha512-lPgDSU+SJLK3xmFDTV2ZRQAiM7UuUjGidwBywFavObCiZc1BeAAcMtHJKUya92hPHO+at63JJPLygilZard8jw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-syntax-import-attributes@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.22.5.tgz#ab840248d834410b829f569f5262b9e517555ecb"
-  integrity sha512-KwvoWDeNKPETmozyFE0P2rOLqh39EoQHNjqizrI5B8Vt0ZNS7M56s7dAiAqbYfiAYOuIzIh96z3iR2ktgu3tEg==
+"@babel/plugin-syntax-import-attributes@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.23.3.tgz#992aee922cf04512461d7dae3ff6951b90a2dc06"
+  integrity sha512-pawnE0P9g10xgoP7yKr6CK63K2FMsTE+FZidZO/1PwRdzmAPVs+HS1mAURUsgaoxammTJvULUdIkEK0gOcU2tA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
@@ -419,211 +427,211 @@
     "@babel/helper-create-regexp-features-plugin" "^7.18.6"
     "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-arrow-functions@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.22.5.tgz#e5ba566d0c58a5b2ba2a8b795450641950b71958"
-  integrity sha512-26lTNXoVRdAnsaDXPpvCNUq+OVWEVC6bx7Vvz9rC53F2bagUWW4u4ii2+h8Fejfh7RYqPxn+libeFBBck9muEw==
+"@babel/plugin-transform-arrow-functions@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.23.3.tgz#94c6dcfd731af90f27a79509f9ab7fb2120fc38b"
+  integrity sha512-NzQcQrzaQPkaEwoTm4Mhyl8jI1huEL/WWIEvudjTCMJ9aBZNpsJbMASx7EQECtQQPS/DcnFpo0FIh3LvEO9cxQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-async-generator-functions@^7.23.2":
-  version "7.23.2"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.2.tgz#054afe290d64c6f576f371ccc321772c8ea87ebb"
-  integrity sha512-BBYVGxbDVHfoeXbOwcagAkOQAm9NxoTdMGfTqghu1GrvadSaw6iW3Je6IcL5PNOw8VwjxqBECXy50/iCQSY/lQ==
+"@babel/plugin-transform-async-generator-functions@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.3.tgz#9df2627bad7f434ed13eef3e61b2b65cafd4885b"
+  integrity sha512-59GsVNavGxAXCDDbakWSMJhajASb4kBCqDjqJsv+p5nKdbz7istmZ3HrX3L2LuiI80+zsOADCvooqQH3qGCucQ==
   dependencies:
     "@babel/helper-environment-visitor" "^7.22.20"
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/helper-remap-async-to-generator" "^7.22.20"
     "@babel/plugin-syntax-async-generators" "^7.8.4"
 
-"@babel/plugin-transform-async-to-generator@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.22.5.tgz#c7a85f44e46f8952f6d27fe57c2ed3cc084c3775"
-  integrity sha512-b1A8D8ZzE/VhNDoV1MSJTnpKkCG5bJo+19R4o4oy03zM7ws8yEMK755j61Dc3EyvdysbqH5BOOTquJ7ZX9C6vQ==
+"@babel/plugin-transform-async-to-generator@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.23.3.tgz#d1f513c7a8a506d43f47df2bf25f9254b0b051fa"
+  integrity sha512-A7LFsKi4U4fomjqXJlZg/u0ft/n8/7n7lpffUP/ZULx/DtV9SGlNKZolHH6PE8Xl1ngCc0M11OaeZptXVkfKSw==
   dependencies:
-    "@babel/helper-module-imports" "^7.22.5"
+    "@babel/helper-module-imports" "^7.22.15"
     "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-remap-async-to-generator" "^7.22.5"
+    "@babel/helper-remap-async-to-generator" "^7.22.20"
 
-"@babel/plugin-transform-block-scoped-functions@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.22.5.tgz#27978075bfaeb9fa586d3cb63a3d30c1de580024"
-  integrity sha512-tdXZ2UdknEKQWKJP1KMNmuF5Lx3MymtMN/pvA+p/VEkhK8jVcQ1fzSy8KM9qRYhAf2/lV33hoMPKI/xaI9sADA==
+"@babel/plugin-transform-block-scoped-functions@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.23.3.tgz#fe1177d715fb569663095e04f3598525d98e8c77"
+  integrity sha512-vI+0sIaPIO6CNuM9Kk5VmXcMVRiOpDh7w2zZt9GXzmE/9KD70CUEVhvPR/etAeNK/FAEkhxQtXOzVF3EuRL41A==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-block-scoping@^7.23.0":
-  version "7.23.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.23.0.tgz#8744d02c6c264d82e1a4bc5d2d501fd8aff6f022"
-  integrity sha512-cOsrbmIOXmf+5YbL99/S49Y3j46k/T16b9ml8bm9lP6N9US5iQ2yBK7gpui1pg0V/WMcXdkfKbTb7HXq9u+v4g==
+"@babel/plugin-transform-block-scoping@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.23.3.tgz#e99a3ff08f58edd28a8ed82481df76925a4ffca7"
+  integrity sha512-QPZxHrThbQia7UdvfpaRRlq/J9ciz1J4go0k+lPBXbgaNeY7IQrBj/9ceWjvMMI07/ZBzHl/F0R/2K0qH7jCVw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-class-properties@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.22.5.tgz#97a56e31ad8c9dc06a0b3710ce7803d5a48cca77"
-  integrity sha512-nDkQ0NfkOhPTq8YCLiWNxp1+f9fCobEjCb0n8WdbNUBc4IB5V7P1QnX9IjpSoquKrXF5SKojHleVNs2vGeHCHQ==
+"@babel/plugin-transform-class-properties@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.23.3.tgz#35c377db11ca92a785a718b6aa4e3ed1eb65dc48"
+  integrity sha512-uM+AN8yCIjDPccsKGlw271xjJtGii+xQIF/uMPS8H15L12jZTsLfF4o5vNO7d/oUguOyfdikHGc/yi9ge4SGIg==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.22.5"
+    "@babel/helper-create-class-features-plugin" "^7.22.15"
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-class-static-block@^7.22.11":
-  version "7.22.11"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.22.11.tgz#dc8cc6e498f55692ac6b4b89e56d87cec766c974"
-  integrity sha512-GMM8gGmqI7guS/llMFk1bJDkKfn3v3C4KHK9Yg1ey5qcHcOlKb0QvcMrgzvxo+T03/4szNh5lghY+fEC98Kq9g==
+"@babel/plugin-transform-class-static-block@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.23.3.tgz#56f2371c7e5bf6ff964d84c5dc4d4db5536b5159"
+  integrity sha512-PENDVxdr7ZxKPyi5Ffc0LjXdnJyrJxyqF5T5YjlVg4a0VFfQHW0r8iAtRiDXkfHlu1wwcvdtnndGYIeJLSuRMQ==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.22.11"
+    "@babel/helper-create-class-features-plugin" "^7.22.15"
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/plugin-syntax-class-static-block" "^7.14.5"
 
-"@babel/plugin-transform-classes@^7.22.15":
-  version "7.22.15"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.15.tgz#aaf4753aee262a232bbc95451b4bdf9599c65a0b"
-  integrity sha512-VbbC3PGjBdE0wAWDdHM9G8Gm977pnYI0XpqMd6LrKISj8/DJXEsWqgRuTYaNE9Bv0JGhTZUzHDlMk18IpOuoqw==
+"@babel/plugin-transform-classes@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.23.3.tgz#73380c632c095b03e8503c24fd38f95ad41ffacb"
+  integrity sha512-FGEQmugvAEu2QtgtU0uTASXevfLMFfBeVCIIdcQhn/uBQsMTjBajdnAtanQlOcuihWh10PZ7+HWvc7NtBwP74w==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.22.5"
     "@babel/helper-compilation-targets" "^7.22.15"
-    "@babel/helper-environment-visitor" "^7.22.5"
-    "@babel/helper-function-name" "^7.22.5"
+    "@babel/helper-environment-visitor" "^7.22.20"
+    "@babel/helper-function-name" "^7.23.0"
     "@babel/helper-optimise-call-expression" "^7.22.5"
     "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-replace-supers" "^7.22.9"
+    "@babel/helper-replace-supers" "^7.22.20"
     "@babel/helper-split-export-declaration" "^7.22.6"
     globals "^11.1.0"
 
-"@babel/plugin-transform-computed-properties@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.22.5.tgz#cd1e994bf9f316bd1c2dafcd02063ec261bb3869"
-  integrity sha512-4GHWBgRf0krxPX+AaPtgBAlTgTeZmqDynokHOX7aqqAB4tHs3U2Y02zH6ETFdLZGcg9UQSD1WCmkVrE9ErHeOg==
+"@babel/plugin-transform-computed-properties@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.23.3.tgz#652e69561fcc9d2b50ba4f7ac7f60dcf65e86474"
+  integrity sha512-dTj83UVTLw/+nbiHqQSFdwO9CbTtwq1DsDqm3CUEtDrZNET5rT5E6bIdTlOftDTDLMYxvxHNEYO4B9SLl8SLZw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/template" "^7.22.5"
+    "@babel/template" "^7.22.15"
 
-"@babel/plugin-transform-destructuring@^7.23.0":
-  version "7.23.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.23.0.tgz#6447aa686be48b32eaf65a73e0e2c0bd010a266c"
-  integrity sha512-vaMdgNXFkYrB+8lbgniSYWHsgqK5gjaMNcc84bMIOMRLH0L9AqYq3hwMdvnyqj1OPqea8UtjPEuS/DCenah1wg==
+"@babel/plugin-transform-destructuring@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.23.3.tgz#8c9ee68228b12ae3dff986e56ed1ba4f3c446311"
+  integrity sha512-n225npDqjDIr967cMScVKHXJs7rout1q+tt50inyBCPkyZ8KxeI6d+GIbSBTT/w/9WdlWDOej3V9HE5Lgk57gw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-dotall-regex@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.22.5.tgz#dbb4f0e45766eb544e193fb00e65a1dd3b2a4165"
-  integrity sha512-5/Yk9QxCQCl+sOIB1WelKnVRxTJDSAIxtJLL2/pqL14ZVlbH0fUQUZa/T5/UnQtBNgghR7mfB8ERBKyKPCi7Vw==
+"@babel/plugin-transform-dotall-regex@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.23.3.tgz#3f7af6054882ede89c378d0cf889b854a993da50"
+  integrity sha512-vgnFYDHAKzFaTVp+mneDsIEbnJ2Np/9ng9iviHw3P/KVcgONxpNULEW/51Z/BaFojG2GI2GwwXck5uV1+1NOYQ==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.22.5"
+    "@babel/helper-create-regexp-features-plugin" "^7.22.15"
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-duplicate-keys@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.22.5.tgz#b6e6428d9416f5f0bba19c70d1e6e7e0b88ab285"
-  integrity sha512-dEnYD+9BBgld5VBXHnF/DbYGp3fqGMsyxKbtD1mDyIA7AkTSpKXFhCVuj/oQVOoALfBs77DudA0BE4d5mcpmqw==
+"@babel/plugin-transform-duplicate-keys@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.23.3.tgz#664706ca0a5dfe8d066537f99032fc1dc8b720ce"
+  integrity sha512-RrqQ+BQmU3Oyav3J+7/myfvRCq7Tbz+kKLLshUmMwNlDHExbGL7ARhajvoBJEvc+fCguPPu887N+3RRXBVKZUA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-dynamic-import@^7.22.11":
-  version "7.22.11"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.22.11.tgz#2c7722d2a5c01839eaf31518c6ff96d408e447aa"
-  integrity sha512-g/21plo58sfteWjaO0ZNVb+uEOkJNjAaHhbejrnBmu011l/eNDScmkbjCC3l4FKb10ViaGU4aOkFznSu2zRHgA==
+"@babel/plugin-transform-dynamic-import@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.23.3.tgz#82625924da9ed5fb11a428efb02e43bc9a3ab13e"
+  integrity sha512-vTG+cTGxPFou12Rj7ll+eD5yWeNl5/8xvQvF08y5Gv3v4mZQoyFf8/n9zg4q5vvCWt5jmgymfzMAldO7orBn7A==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/plugin-syntax-dynamic-import" "^7.8.3"
 
-"@babel/plugin-transform-exponentiation-operator@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.22.5.tgz#402432ad544a1f9a480da865fda26be653e48f6a"
-  integrity sha512-vIpJFNM/FjZ4rh1myqIya9jXwrwwgFRHPjT3DkUA9ZLHuzox8jiXkOLvwm1H+PQIP3CqfC++WPKeuDi0Sjdj1g==
+"@babel/plugin-transform-exponentiation-operator@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.23.3.tgz#ea0d978f6b9232ba4722f3dbecdd18f450babd18"
+  integrity sha512-5fhCsl1odX96u7ILKHBj4/Y8vipoqwsJMh4csSA8qFfxrZDEA4Ssku2DyNvMJSmZNOEBT750LfFPbtrnTP90BQ==
   dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.22.5"
+    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.22.15"
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-export-namespace-from@^7.22.11":
-  version "7.22.11"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.22.11.tgz#b3c84c8f19880b6c7440108f8929caf6056db26c"
-  integrity sha512-xa7aad7q7OiT8oNZ1mU7NrISjlSkVdMbNxn9IuLZyL9AJEhs1Apba3I+u5riX1dIkdptP5EKDG5XDPByWxtehw==
+"@babel/plugin-transform-export-namespace-from@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.23.3.tgz#dcd066d995f6ac6077e5a4ccb68322a01e23ac49"
+  integrity sha512-yCLhW34wpJWRdTxxWtFZASJisihrfyMOTOQexhVzA78jlU+dH7Dw+zQgcPepQ5F3C6bAIiblZZ+qBggJdHiBAg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
 
-"@babel/plugin-transform-for-of@^7.22.15":
-  version "7.22.15"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.22.15.tgz#f64b4ccc3a4f131a996388fae7680b472b306b29"
-  integrity sha512-me6VGeHsx30+xh9fbDLLPi0J1HzmeIIyenoOQHuw2D4m2SAU3NrspX5XxJLBpqn5yrLzrlw2Iy3RA//Bx27iOA==
+"@babel/plugin-transform-for-of@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.23.3.tgz#afe115ff0fbce735e02868d41489093c63e15559"
+  integrity sha512-X8jSm8X1CMwxmK878qsUGJRmbysKNbdpTv/O1/v0LuY/ZkZrng5WYiekYSdg9m09OTmDDUWeEDsTE+17WYbAZw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-function-name@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.22.5.tgz#935189af68b01898e0d6d99658db6b164205c143"
-  integrity sha512-UIzQNMS0p0HHiQm3oelztj+ECwFnj+ZRV4KnguvlsD2of1whUeM6o7wGNj6oLwcDoAXQ8gEqfgC24D+VdIcevg==
+"@babel/plugin-transform-function-name@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.23.3.tgz#8f424fcd862bf84cb9a1a6b42bc2f47ed630f8dc"
+  integrity sha512-I1QXp1LxIvt8yLaib49dRW5Okt7Q4oaxao6tFVKS/anCdEOMtYwWVKoiOA1p34GOWIZjUK0E+zCp7+l1pfQyiw==
   dependencies:
-    "@babel/helper-compilation-targets" "^7.22.5"
-    "@babel/helper-function-name" "^7.22.5"
+    "@babel/helper-compilation-targets" "^7.22.15"
+    "@babel/helper-function-name" "^7.23.0"
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-json-strings@^7.22.11":
-  version "7.22.11"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.22.11.tgz#689a34e1eed1928a40954e37f74509f48af67835"
-  integrity sha512-CxT5tCqpA9/jXFlme9xIBCc5RPtdDq3JpkkhgHQqtDdiTnTI0jtZ0QzXhr5DILeYifDPp2wvY2ad+7+hLMW5Pw==
+"@babel/plugin-transform-json-strings@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.23.3.tgz#489724ab7d3918a4329afb4172b2fd2cf3c8d245"
+  integrity sha512-H9Ej2OiISIZowZHaBwF0tsJOih1PftXJtE8EWqlEIwpc7LMTGq0rPOrywKLQ4nefzx8/HMR0D3JGXoMHYvhi0A==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/plugin-syntax-json-strings" "^7.8.3"
 
-"@babel/plugin-transform-literals@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.22.5.tgz#e9341f4b5a167952576e23db8d435849b1dd7920"
-  integrity sha512-fTLj4D79M+mepcw3dgFBTIDYpbcB9Sm0bpm4ppXPaO+U+PKFFyV9MGRvS0gvGw62sd10kT5lRMKXAADb9pWy8g==
+"@babel/plugin-transform-literals@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.23.3.tgz#8214665f00506ead73de157eba233e7381f3beb4"
+  integrity sha512-wZ0PIXRxnwZvl9AYpqNUxpZ5BiTGrYt7kueGQ+N5FiQ7RCOD4cm8iShd6S6ggfVIWaJf2EMk8eRzAh52RfP4rQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-logical-assignment-operators@^7.22.11":
-  version "7.22.11"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.22.11.tgz#24c522a61688bde045b7d9bc3c2597a4d948fc9c"
-  integrity sha512-qQwRTP4+6xFCDV5k7gZBF3C31K34ut0tbEcTKxlX/0KXxm9GLcO14p570aWxFvVzx6QAfPgq7gaeIHXJC8LswQ==
+"@babel/plugin-transform-logical-assignment-operators@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.23.3.tgz#3a406d6083feb9487083bca6d2334a3c9b6c4808"
+  integrity sha512-+pD5ZbxofyOygEp+zZAfujY2ShNCXRpDRIPOiBmTO693hhyOEteZgl876Xs9SAHPQpcV0vz8LvA/T+w8AzyX8A==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
 
-"@babel/plugin-transform-member-expression-literals@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.22.5.tgz#4fcc9050eded981a468347dd374539ed3e058def"
-  integrity sha512-RZEdkNtzzYCFl9SE9ATaUMTj2hqMb4StarOJLrZRbqqU4HSBE7UlBw9WBWQiDzrJZJdUWiMTVDI6Gv/8DPvfew==
+"@babel/plugin-transform-member-expression-literals@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.23.3.tgz#e37b3f0502289f477ac0e776b05a833d853cabcc"
+  integrity sha512-sC3LdDBDi5x96LA+Ytekz2ZPk8i/Ck+DEuDbRAll5rknJ5XRTSaPKEYwomLcs1AA8wg9b3KjIQRsnApj+q51Ag==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-modules-amd@^7.23.0":
-  version "7.23.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.23.0.tgz#05b2bc43373faa6d30ca89214731f76f966f3b88"
-  integrity sha512-xWT5gefv2HGSm4QHtgc1sYPbseOyf+FFDo2JbpE25GWl5BqTGO9IMwTYJRoIdjsF85GE+VegHxSCUt5EvoYTAw==
+"@babel/plugin-transform-modules-amd@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.23.3.tgz#e19b55436a1416829df0a1afc495deedfae17f7d"
+  integrity sha512-vJYQGxeKM4t8hYCKVBlZX/gtIY2I7mRGFNcm85sgXGMTBcoV3QdVtdpbcWEbzbfUIUZKwvgFT82mRvaQIebZzw==
   dependencies:
-    "@babel/helper-module-transforms" "^7.23.0"
+    "@babel/helper-module-transforms" "^7.23.3"
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-modules-commonjs@^7.23.0":
-  version "7.23.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.23.0.tgz#b3dba4757133b2762c00f4f94590cf6d52602481"
-  integrity sha512-32Xzss14/UVc7k9g775yMIvkVK8xwKE0DPdP5JTapr3+Z9w4tzeOuLNY6BXDQR6BdnzIlXnCGAzsk/ICHBLVWQ==
+"@babel/plugin-transform-modules-commonjs@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.23.3.tgz#661ae831b9577e52be57dd8356b734f9700b53b4"
+  integrity sha512-aVS0F65LKsdNOtcz6FRCpE4OgsP2OFnW46qNxNIX9h3wuzaNcSQsJysuMwqSibC98HPrf2vCgtxKNwS0DAlgcA==
   dependencies:
-    "@babel/helper-module-transforms" "^7.23.0"
+    "@babel/helper-module-transforms" "^7.23.3"
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/helper-simple-access" "^7.22.5"
 
-"@babel/plugin-transform-modules-systemjs@^7.23.0":
-  version "7.23.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.23.0.tgz#77591e126f3ff4132a40595a6cccd00a6b60d160"
-  integrity sha512-qBej6ctXZD2f+DhlOC9yO47yEYgUh5CZNz/aBoH4j/3NOlRfJXJbY7xDQCqQVf9KbrqGzIWER1f23doHGrIHFg==
+"@babel/plugin-transform-modules-systemjs@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.23.3.tgz#fa7e62248931cb15b9404f8052581c302dd9de81"
+  integrity sha512-ZxyKGTkF9xT9YJuKQRo19ewf3pXpopuYQd8cDXqNzc3mUNbOME0RKMoZxviQk74hwzfQsEe66dE92MaZbdHKNQ==
   dependencies:
     "@babel/helper-hoist-variables" "^7.22.5"
-    "@babel/helper-module-transforms" "^7.23.0"
+    "@babel/helper-module-transforms" "^7.23.3"
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/helper-validator-identifier" "^7.22.20"
 
-"@babel/plugin-transform-modules-umd@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.22.5.tgz#4694ae40a87b1745e3775b6a7fe96400315d4f98"
-  integrity sha512-+S6kzefN/E1vkSsKx8kmQuqeQsvCKCd1fraCM7zXm4SFoggI099Tr4G8U81+5gtMdUeMQ4ipdQffbKLX0/7dBQ==
+"@babel/plugin-transform-modules-umd@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.23.3.tgz#5d4395fccd071dfefe6585a4411aa7d6b7d769e9"
+  integrity sha512-zHsy9iXX2nIsCBFPud3jKn1IRPWg3Ing1qOZgeKV39m1ZgIdpJqvlWVeiHBZC6ITRG0MfskhYe9cLgntfSFPIg==
   dependencies:
-    "@babel/helper-module-transforms" "^7.22.5"
+    "@babel/helper-module-transforms" "^7.23.3"
     "@babel/helper-plugin-utils" "^7.22.5"
 
 "@babel/plugin-transform-named-capturing-groups-regex@^7.22.5":
@@ -634,198 +642,199 @@
     "@babel/helper-create-regexp-features-plugin" "^7.22.5"
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-new-target@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.22.5.tgz#1b248acea54ce44ea06dfd37247ba089fcf9758d"
-  integrity sha512-AsF7K0Fx/cNKVyk3a+DW0JLo+Ua598/NxMRvxDnkpCIGFh43+h/v2xyhRUYf6oD8gE4QtL83C7zZVghMjHd+iw==
+"@babel/plugin-transform-new-target@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.23.3.tgz#5491bb78ed6ac87e990957cea367eab781c4d980"
+  integrity sha512-YJ3xKqtJMAT5/TIZnpAR3I+K+WaDowYbN3xyxI8zxx/Gsypwf9B9h0VB+1Nh6ACAAPRS5NSRje0uVv5i79HYGQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-nullish-coalescing-operator@^7.22.11":
-  version "7.22.11"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.22.11.tgz#debef6c8ba795f5ac67cd861a81b744c5d38d9fc"
-  integrity sha512-YZWOw4HxXrotb5xsjMJUDlLgcDXSfO9eCmdl1bgW4+/lAGdkjaEvOnQ4p5WKKdUgSzO39dgPl0pTnfxm0OAXcg==
+"@babel/plugin-transform-nullish-coalescing-operator@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.23.3.tgz#8a613d514b521b640344ed7c56afeff52f9413f8"
+  integrity sha512-xzg24Lnld4DYIdysyf07zJ1P+iIfJpxtVFOzX4g+bsJ3Ng5Le7rXx9KwqKzuyaUeRnt+I1EICwQITqc0E2PmpA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
 
-"@babel/plugin-transform-numeric-separator@^7.22.11":
-  version "7.22.11"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.22.11.tgz#498d77dc45a6c6db74bb829c02a01c1d719cbfbd"
-  integrity sha512-3dzU4QGPsILdJbASKhF/V2TVP+gJya1PsueQCxIPCEcerqF21oEcrob4mzjsp2Py/1nLfF5m+xYNMDpmA8vffg==
+"@babel/plugin-transform-numeric-separator@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.23.3.tgz#2f8da42b75ba89e5cfcd677afd0856d52c0c2e68"
+  integrity sha512-s9GO7fIBi/BLsZ0v3Rftr6Oe4t0ctJ8h4CCXfPoEJwmvAPMyNrfkOOJzm6b9PX9YXcCJWWQd/sBF/N26eBiMVw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/plugin-syntax-numeric-separator" "^7.10.4"
 
-"@babel/plugin-transform-object-rest-spread@^7.22.15":
-  version "7.22.15"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.22.15.tgz#21a95db166be59b91cde48775310c0df6e1da56f"
-  integrity sha512-fEB+I1+gAmfAyxZcX1+ZUwLeAuuf8VIg67CTznZE0MqVFumWkh8xWtn58I4dxdVf080wn7gzWoF8vndOViJe9Q==
+"@babel/plugin-transform-object-rest-spread@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.23.3.tgz#509373753b5f7202fe1940e92fd075bd7874955f"
+  integrity sha512-VxHt0ANkDmu8TANdE9Kc0rndo/ccsmfe2Cx2y5sI4hu3AukHQ5wAu4cM7j3ba8B9548ijVyclBU+nuDQftZsog==
   dependencies:
-    "@babel/compat-data" "^7.22.9"
+    "@babel/compat-data" "^7.23.3"
     "@babel/helper-compilation-targets" "^7.22.15"
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
-    "@babel/plugin-transform-parameters" "^7.22.15"
+    "@babel/plugin-transform-parameters" "^7.23.3"
 
-"@babel/plugin-transform-object-super@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.22.5.tgz#794a8d2fcb5d0835af722173c1a9d704f44e218c"
-  integrity sha512-klXqyaT9trSjIUrcsYIfETAzmOEZL3cBYqOYLJxBHfMFFggmXOv+NYSX/Jbs9mzMVESw/WycLFPRx8ba/b2Ipw==
+"@babel/plugin-transform-object-super@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.23.3.tgz#81fdb636dcb306dd2e4e8fd80db5b2362ed2ebcd"
+  integrity sha512-BwQ8q0x2JG+3lxCVFohg+KbQM7plfpBwThdW9A6TMtWwLsbDA01Ek2Zb/AgDN39BiZsExm4qrXxjk+P1/fzGrA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-replace-supers" "^7.22.5"
+    "@babel/helper-replace-supers" "^7.22.20"
 
-"@babel/plugin-transform-optional-catch-binding@^7.22.11":
-  version "7.22.11"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.22.11.tgz#461cc4f578a127bb055527b3e77404cad38c08e0"
-  integrity sha512-rli0WxesXUeCJnMYhzAglEjLWVDF6ahb45HuprcmQuLidBJFWjNnOzssk2kuc6e33FlLaiZhG/kUIzUMWdBKaQ==
+"@babel/plugin-transform-optional-catch-binding@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.23.3.tgz#362c0b545ee9e5b0fa9d9e6fe77acf9d4c480027"
+  integrity sha512-LxYSb0iLjUamfm7f1D7GpiS4j0UAC8AOiehnsGAP8BEsIX8EOi3qV6bbctw8M7ZvLtcoZfZX5Z7rN9PlWk0m5A==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
 
-"@babel/plugin-transform-optional-chaining@^7.22.15", "@babel/plugin-transform-optional-chaining@^7.23.0":
-  version "7.23.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.23.0.tgz#73ff5fc1cf98f542f09f29c0631647d8ad0be158"
-  integrity sha512-sBBGXbLJjxTzLBF5rFWaikMnOGOk/BmK6vVByIdEggZ7Vn6CvWXZyRkkLFK6WE0IF8jSliyOkUN6SScFgzCM0g==
+"@babel/plugin-transform-optional-chaining@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.23.3.tgz#92fc83f54aa3adc34288933fa27e54c13113f4be"
+  integrity sha512-zvL8vIfIUgMccIAK1lxjvNv572JHFJIKb4MWBz5OGdBQA0fB0Xluix5rmOby48exiJc987neOmP/m9Fnpkz3Tg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
 
-"@babel/plugin-transform-parameters@^7.22.15":
-  version "7.22.15"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.22.15.tgz#719ca82a01d177af358df64a514d64c2e3edb114"
-  integrity sha512-hjk7qKIqhyzhhUvRT683TYQOFa/4cQKwQy7ALvTpODswN40MljzNDa0YldevS6tGbxwaEKVn502JmY0dP7qEtQ==
+"@babel/plugin-transform-parameters@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.23.3.tgz#83ef5d1baf4b1072fa6e54b2b0999a7b2527e2af"
+  integrity sha512-09lMt6UsUb3/34BbECKVbVwrT9bO6lILWln237z7sLaWnMsTi7Yc9fhX5DLpkJzAGfaReXI22wP41SZmnAA3Vw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-private-methods@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.22.5.tgz#21c8af791f76674420a147ae62e9935d790f8722"
-  integrity sha512-PPjh4gyrQnGe97JTalgRGMuU4icsZFnWkzicB/fUtzlKUqvsWBKEpPPfr5a2JiyirZkHxnAqkQMO5Z5B2kK3fA==
+"@babel/plugin-transform-private-methods@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.23.3.tgz#b2d7a3c97e278bfe59137a978d53b2c2e038c0e4"
+  integrity sha512-UzqRcRtWsDMTLrRWFvUBDwmw06tCQH9Rl1uAjfh6ijMSmGYQ+fpdB+cnqRC8EMh5tuuxSv0/TejGL+7vyj+50g==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.22.5"
+    "@babel/helper-create-class-features-plugin" "^7.22.15"
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-private-property-in-object@^7.22.11":
-  version "7.22.11"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.22.11.tgz#ad45c4fc440e9cb84c718ed0906d96cf40f9a4e1"
-  integrity sha512-sSCbqZDBKHetvjSwpyWzhuHkmW5RummxJBVbYLkGkaiTOWGxml7SXt0iWa03bzxFIx7wOj3g/ILRd0RcJKBeSQ==
+"@babel/plugin-transform-private-property-in-object@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.23.3.tgz#5cd34a2ce6f2d008cc8f91d8dcc29e2c41466da6"
+  integrity sha512-a5m2oLNFyje2e/rGKjVfAELTVI5mbA0FeZpBnkOWWV7eSmKQ+T/XW0Vf+29ScLzSxX+rnsarvU0oie/4m6hkxA==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.22.5"
-    "@babel/helper-create-class-features-plugin" "^7.22.11"
+    "@babel/helper-create-class-features-plugin" "^7.22.15"
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
 
-"@babel/plugin-transform-property-literals@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.22.5.tgz#b5ddabd73a4f7f26cd0e20f5db48290b88732766"
-  integrity sha512-TiOArgddK3mK/x1Qwf5hay2pxI6wCZnvQqrFSqbtg1GLl2JcNMitVH/YnqjP+M31pLUeTfzY1HAXFDnUBV30rQ==
+"@babel/plugin-transform-property-literals@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.23.3.tgz#54518f14ac4755d22b92162e4a852d308a560875"
+  integrity sha512-jR3Jn3y7cZp4oEWPFAlRsSWjxKe4PZILGBSd4nis1TsC5qeSpb+nrtihJuDhNI7QHiVbUaiXa0X2RZY3/TI6Nw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-regenerator@^7.22.10":
-  version "7.22.10"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.22.10.tgz#8ceef3bd7375c4db7652878b0241b2be5d0c3cca"
-  integrity sha512-F28b1mDt8KcT5bUyJc/U9nwzw6cV+UmTeRlXYIl2TNqMMJif0Jeey9/RQ3C4NOd2zp0/TRsDns9ttj2L523rsw==
+"@babel/plugin-transform-regenerator@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.23.3.tgz#141afd4a2057298602069fce7f2dc5173e6c561c"
+  integrity sha512-KP+75h0KghBMcVpuKisx3XTu9Ncut8Q8TuvGO4IhY+9D5DFEckQefOuIsB/gQ2tG71lCke4NMrtIPS8pOj18BQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
     regenerator-transform "^0.15.2"
 
-"@babel/plugin-transform-reserved-words@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.22.5.tgz#832cd35b81c287c4bcd09ce03e22199641f964fb"
-  integrity sha512-DTtGKFRQUDm8svigJzZHzb/2xatPc6TzNvAIJ5GqOKDsGFYgAskjRulbR/vGsPKq3OPqtexnz327qYpP57RFyA==
+"@babel/plugin-transform-reserved-words@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.23.3.tgz#4130dcee12bd3dd5705c587947eb715da12efac8"
+  integrity sha512-QnNTazY54YqgGxwIexMZva9gqbPa15t/x9VS+0fsEFWplwVpXYZivtgl43Z1vMpc1bdPP2PP8siFeVcnFvA3Cg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-shorthand-properties@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.22.5.tgz#6e277654be82b5559fc4b9f58088507c24f0c624"
-  integrity sha512-vM4fq9IXHscXVKzDv5itkO1X52SmdFBFcMIBZ2FRn2nqVYqw6dBexUgMvAjHW+KXpPPViD/Yo3GrDEBaRC0QYA==
+"@babel/plugin-transform-shorthand-properties@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.23.3.tgz#97d82a39b0e0c24f8a981568a8ed851745f59210"
+  integrity sha512-ED2fgqZLmexWiN+YNFX26fx4gh5qHDhn1O2gvEhreLW2iI63Sqm4llRLCXALKrCnbN4Jy0VcMQZl/SAzqug/jg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-spread@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.22.5.tgz#6487fd29f229c95e284ba6c98d65eafb893fea6b"
-  integrity sha512-5ZzDQIGyvN4w8+dMmpohL6MBo+l2G7tfC/O2Dg7/hjpgeWvUx8FzfeOKxGog9IimPa4YekaQ9PlDqTLOljkcxg==
+"@babel/plugin-transform-spread@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.23.3.tgz#41d17aacb12bde55168403c6f2d6bdca563d362c"
+  integrity sha512-VvfVYlrlBVu+77xVTOAoxQ6mZbnIq5FM0aGBSFEcIh03qHf+zNqA4DC/3XMUozTg7bZV3e3mZQ0i13VB6v5yUg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
 
-"@babel/plugin-transform-sticky-regex@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.22.5.tgz#295aba1595bfc8197abd02eae5fc288c0deb26aa"
-  integrity sha512-zf7LuNpHG0iEeiyCNwX4j3gDg1jgt1k3ZdXBKbZSoA3BbGQGvMiSvfbZRR3Dr3aeJe3ooWFZxOOG3IRStYp2Bw==
+"@babel/plugin-transform-sticky-regex@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.23.3.tgz#dec45588ab4a723cb579c609b294a3d1bd22ff04"
+  integrity sha512-HZOyN9g+rtvnOU3Yh7kSxXrKbzgrm5X4GncPY1QOquu7epga5MxKHVpYu2hvQnry/H+JjckSYRb93iNfsioAGg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-template-literals@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.22.5.tgz#8f38cf291e5f7a8e60e9f733193f0bcc10909bff"
-  integrity sha512-5ciOehRNf+EyUeewo8NkbQiUs4d6ZxiHo6BcBcnFlgiJfu16q0bQUw9Jvo0b0gBKFG1SMhDSjeKXSYuJLeFSMA==
+"@babel/plugin-transform-template-literals@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.23.3.tgz#5f0f028eb14e50b5d0f76be57f90045757539d07"
+  integrity sha512-Flok06AYNp7GV2oJPZZcP9vZdszev6vPBkHLwxwSpaIqx75wn6mUd3UFWsSsA0l8nXAKkyCmL/sR02m8RYGeHg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-typeof-symbol@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.22.5.tgz#5e2ba478da4b603af8673ff7c54f75a97b716b34"
-  integrity sha512-bYkI5lMzL4kPii4HHEEChkD0rkc+nvnlR6+o/qdqR6zrm0Sv/nodmyLhlq2DO0YKLUNd2VePmPRjJXSBh9OIdA==
+"@babel/plugin-transform-typeof-symbol@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.23.3.tgz#9dfab97acc87495c0c449014eb9c547d8966bca4"
+  integrity sha512-4t15ViVnaFdrPC74be1gXBSMzXk3B4Us9lP7uLRQHTFpV5Dvt33pn+2MyyNxmN3VTTm3oTrZVMUmuw3oBnQ2oQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-unicode-escapes@^7.22.10":
-  version "7.22.10"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.22.10.tgz#c723f380f40a2b2f57a62df24c9005834c8616d9"
-  integrity sha512-lRfaRKGZCBqDlRU3UIFovdp9c9mEvlylmpod0/OatICsSfuQ9YFthRo1tpTkGsklEefZdqlEFdY4A2dwTb6ohg==
+"@babel/plugin-transform-unicode-escapes@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.23.3.tgz#1f66d16cab01fab98d784867d24f70c1ca65b925"
+  integrity sha512-OMCUx/bU6ChE3r4+ZdylEqAjaQgHAgipgW8nsCfu5pGqDcFytVd91AwRvUJSBZDz0exPGgnjoqhgRYLRjFZc9Q==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-unicode-property-regex@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.22.5.tgz#098898f74d5c1e86660dc112057b2d11227f1c81"
-  integrity sha512-HCCIb+CbJIAE6sXn5CjFQXMwkCClcOfPCzTlilJ8cUatfzwHlWQkbtV0zD338u9dZskwvuOYTuuaMaA8J5EI5A==
+"@babel/plugin-transform-unicode-property-regex@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.23.3.tgz#19e234129e5ffa7205010feec0d94c251083d7ad"
+  integrity sha512-KcLIm+pDZkWZQAFJ9pdfmh89EwVfmNovFBcXko8szpBeF8z68kWIPeKlmSOkT9BXJxs2C0uk+5LxoxIv62MROA==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.22.5"
+    "@babel/helper-create-regexp-features-plugin" "^7.22.15"
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-unicode-regex@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.22.5.tgz#ce7e7bb3ef208c4ff67e02a22816656256d7a183"
-  integrity sha512-028laaOKptN5vHJf9/Arr/HiJekMd41hOEZYvNsrsXqJ7YPYuX2bQxh31fkZzGmq3YqHRJzYFFAVYvKfMPKqyg==
+"@babel/plugin-transform-unicode-regex@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.23.3.tgz#26897708d8f42654ca4ce1b73e96140fbad879dc"
+  integrity sha512-wMHpNA4x2cIA32b/ci3AfwNgheiva2W0WUKWTK7vBHBhDKfPsc5cFGNWm69WBqpwd86u1qwZ9PWevKqm1A3yAw==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.22.5"
+    "@babel/helper-create-regexp-features-plugin" "^7.22.15"
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-unicode-sets-regex@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.22.5.tgz#77788060e511b708ffc7d42fdfbc5b37c3004e91"
-  integrity sha512-lhMfi4FC15j13eKrh3DnYHjpGj6UKQHtNKTbtc1igvAhRy4+kLhV07OpLcsN0VgDEw/MjAvJO4BdMJsHwMhzCg==
+"@babel/plugin-transform-unicode-sets-regex@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.23.3.tgz#4fb6f0a719c2c5859d11f6b55a050cc987f3799e"
+  integrity sha512-W7lliA/v9bNR83Qc3q1ip9CQMZ09CcHDbHfbLRDNuAhn1Mvkr1ZNF7hPmztMQvtTGVLJ9m8IZqWsTkXOml8dbw==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.22.5"
+    "@babel/helper-create-regexp-features-plugin" "^7.22.15"
     "@babel/helper-plugin-utils" "^7.22.5"
 
 "@babel/preset-env@^7.11.0":
-  version "7.23.2"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.23.2.tgz#1f22be0ff0e121113260337dbc3e58fafce8d059"
-  integrity sha512-BW3gsuDD+rvHL2VO2SjAUNTBe5YrjsTiDyqamPDWY723na3/yPQ65X5oQkFVJZ0o50/2d+svm1rkPoJeR1KxVQ==
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.23.3.tgz#d299e0140a7650684b95c62be2db0ef8c975143e"
+  integrity sha512-ovzGc2uuyNfNAs/jyjIGxS8arOHS5FENZaNn4rtE7UdKMMkqHCvboHfcuhWLZNX5cB44QfcGNWjaevxMzzMf+Q==
   dependencies:
-    "@babel/compat-data" "^7.23.2"
+    "@babel/compat-data" "^7.23.3"
     "@babel/helper-compilation-targets" "^7.22.15"
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/helper-validator-option" "^7.22.15"
-    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.22.15"
-    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.22.15"
+    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.23.3"
+    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.23.3"
+    "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly" "^7.23.3"
     "@babel/plugin-proposal-private-property-in-object" "7.21.0-placeholder-for-preset-env.2"
     "@babel/plugin-syntax-async-generators" "^7.8.4"
     "@babel/plugin-syntax-class-properties" "^7.12.13"
     "@babel/plugin-syntax-class-static-block" "^7.14.5"
     "@babel/plugin-syntax-dynamic-import" "^7.8.3"
     "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
-    "@babel/plugin-syntax-import-assertions" "^7.22.5"
-    "@babel/plugin-syntax-import-attributes" "^7.22.5"
+    "@babel/plugin-syntax-import-assertions" "^7.23.3"
+    "@babel/plugin-syntax-import-attributes" "^7.23.3"
     "@babel/plugin-syntax-import-meta" "^7.10.4"
     "@babel/plugin-syntax-json-strings" "^7.8.3"
     "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
@@ -837,56 +846,55 @@
     "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
     "@babel/plugin-syntax-top-level-await" "^7.14.5"
     "@babel/plugin-syntax-unicode-sets-regex" "^7.18.6"
-    "@babel/plugin-transform-arrow-functions" "^7.22.5"
-    "@babel/plugin-transform-async-generator-functions" "^7.23.2"
-    "@babel/plugin-transform-async-to-generator" "^7.22.5"
-    "@babel/plugin-transform-block-scoped-functions" "^7.22.5"
-    "@babel/plugin-transform-block-scoping" "^7.23.0"
-    "@babel/plugin-transform-class-properties" "^7.22.5"
-    "@babel/plugin-transform-class-static-block" "^7.22.11"
-    "@babel/plugin-transform-classes" "^7.22.15"
-    "@babel/plugin-transform-computed-properties" "^7.22.5"
-    "@babel/plugin-transform-destructuring" "^7.23.0"
-    "@babel/plugin-transform-dotall-regex" "^7.22.5"
-    "@babel/plugin-transform-duplicate-keys" "^7.22.5"
-    "@babel/plugin-transform-dynamic-import" "^7.22.11"
-    "@babel/plugin-transform-exponentiation-operator" "^7.22.5"
-    "@babel/plugin-transform-export-namespace-from" "^7.22.11"
-    "@babel/plugin-transform-for-of" "^7.22.15"
-    "@babel/plugin-transform-function-name" "^7.22.5"
-    "@babel/plugin-transform-json-strings" "^7.22.11"
-    "@babel/plugin-transform-literals" "^7.22.5"
-    "@babel/plugin-transform-logical-assignment-operators" "^7.22.11"
-    "@babel/plugin-transform-member-expression-literals" "^7.22.5"
-    "@babel/plugin-transform-modules-amd" "^7.23.0"
-    "@babel/plugin-transform-modules-commonjs" "^7.23.0"
-    "@babel/plugin-transform-modules-systemjs" "^7.23.0"
-    "@babel/plugin-transform-modules-umd" "^7.22.5"
+    "@babel/plugin-transform-arrow-functions" "^7.23.3"
+    "@babel/plugin-transform-async-generator-functions" "^7.23.3"
+    "@babel/plugin-transform-async-to-generator" "^7.23.3"
+    "@babel/plugin-transform-block-scoped-functions" "^7.23.3"
+    "@babel/plugin-transform-block-scoping" "^7.23.3"
+    "@babel/plugin-transform-class-properties" "^7.23.3"
+    "@babel/plugin-transform-class-static-block" "^7.23.3"
+    "@babel/plugin-transform-classes" "^7.23.3"
+    "@babel/plugin-transform-computed-properties" "^7.23.3"
+    "@babel/plugin-transform-destructuring" "^7.23.3"
+    "@babel/plugin-transform-dotall-regex" "^7.23.3"
+    "@babel/plugin-transform-duplicate-keys" "^7.23.3"
+    "@babel/plugin-transform-dynamic-import" "^7.23.3"
+    "@babel/plugin-transform-exponentiation-operator" "^7.23.3"
+    "@babel/plugin-transform-export-namespace-from" "^7.23.3"
+    "@babel/plugin-transform-for-of" "^7.23.3"
+    "@babel/plugin-transform-function-name" "^7.23.3"
+    "@babel/plugin-transform-json-strings" "^7.23.3"
+    "@babel/plugin-transform-literals" "^7.23.3"
+    "@babel/plugin-transform-logical-assignment-operators" "^7.23.3"
+    "@babel/plugin-transform-member-expression-literals" "^7.23.3"
+    "@babel/plugin-transform-modules-amd" "^7.23.3"
+    "@babel/plugin-transform-modules-commonjs" "^7.23.3"
+    "@babel/plugin-transform-modules-systemjs" "^7.23.3"
+    "@babel/plugin-transform-modules-umd" "^7.23.3"
     "@babel/plugin-transform-named-capturing-groups-regex" "^7.22.5"
-    "@babel/plugin-transform-new-target" "^7.22.5"
-    "@babel/plugin-transform-nullish-coalescing-operator" "^7.22.11"
-    "@babel/plugin-transform-numeric-separator" "^7.22.11"
-    "@babel/plugin-transform-object-rest-spread" "^7.22.15"
-    "@babel/plugin-transform-object-super" "^7.22.5"
-    "@babel/plugin-transform-optional-catch-binding" "^7.22.11"
-    "@babel/plugin-transform-optional-chaining" "^7.23.0"
-    "@babel/plugin-transform-parameters" "^7.22.15"
-    "@babel/plugin-transform-private-methods" "^7.22.5"
-    "@babel/plugin-transform-private-property-in-object" "^7.22.11"
-    "@babel/plugin-transform-property-literals" "^7.22.5"
-    "@babel/plugin-transform-regenerator" "^7.22.10"
-    "@babel/plugin-transform-reserved-words" "^7.22.5"
-    "@babel/plugin-transform-shorthand-properties" "^7.22.5"
-    "@babel/plugin-transform-spread" "^7.22.5"
-    "@babel/plugin-transform-sticky-regex" "^7.22.5"
-    "@babel/plugin-transform-template-literals" "^7.22.5"
-    "@babel/plugin-transform-typeof-symbol" "^7.22.5"
-    "@babel/plugin-transform-unicode-escapes" "^7.22.10"
-    "@babel/plugin-transform-unicode-property-regex" "^7.22.5"
-    "@babel/plugin-transform-unicode-regex" "^7.22.5"
-    "@babel/plugin-transform-unicode-sets-regex" "^7.22.5"
+    "@babel/plugin-transform-new-target" "^7.23.3"
+    "@babel/plugin-transform-nullish-coalescing-operator" "^7.23.3"
+    "@babel/plugin-transform-numeric-separator" "^7.23.3"
+    "@babel/plugin-transform-object-rest-spread" "^7.23.3"
+    "@babel/plugin-transform-object-super" "^7.23.3"
+    "@babel/plugin-transform-optional-catch-binding" "^7.23.3"
+    "@babel/plugin-transform-optional-chaining" "^7.23.3"
+    "@babel/plugin-transform-parameters" "^7.23.3"
+    "@babel/plugin-transform-private-methods" "^7.23.3"
+    "@babel/plugin-transform-private-property-in-object" "^7.23.3"
+    "@babel/plugin-transform-property-literals" "^7.23.3"
+    "@babel/plugin-transform-regenerator" "^7.23.3"
+    "@babel/plugin-transform-reserved-words" "^7.23.3"
+    "@babel/plugin-transform-shorthand-properties" "^7.23.3"
+    "@babel/plugin-transform-spread" "^7.23.3"
+    "@babel/plugin-transform-sticky-regex" "^7.23.3"
+    "@babel/plugin-transform-template-literals" "^7.23.3"
+    "@babel/plugin-transform-typeof-symbol" "^7.23.3"
+    "@babel/plugin-transform-unicode-escapes" "^7.23.3"
+    "@babel/plugin-transform-unicode-property-regex" "^7.23.3"
+    "@babel/plugin-transform-unicode-regex" "^7.23.3"
+    "@babel/plugin-transform-unicode-sets-regex" "^7.23.3"
     "@babel/preset-modules" "0.1.6-no-external-plugins"
-    "@babel/types" "^7.23.0"
     babel-plugin-polyfill-corejs2 "^0.4.6"
     babel-plugin-polyfill-corejs3 "^0.8.5"
     babel-plugin-polyfill-regenerator "^0.5.3"
@@ -914,7 +922,7 @@
   dependencies:
     regenerator-runtime "^0.14.0"
 
-"@babel/template@^7.22.15", "@babel/template@^7.22.5":
+"@babel/template@^7.22.15":
   version "7.22.15"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.15.tgz#09576efc3830f0430f4548ef971dde1350ef2f38"
   integrity sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==
@@ -923,26 +931,26 @@
     "@babel/parser" "^7.22.15"
     "@babel/types" "^7.22.15"
 
-"@babel/traverse@^7.23.2":
-  version "7.23.2"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.2.tgz#329c7a06735e144a506bdb2cad0268b7f46f4ad8"
-  integrity sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==
+"@babel/traverse@^7.23.2", "@babel/traverse@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.3.tgz#26ee5f252e725aa7aca3474aa5b324eaf7908b5b"
+  integrity sha512-+K0yF1/9yR0oHdE0StHuEj3uTPzwwbrLGfNOndVJVV2TqA5+j3oljJUb4nmB954FLGjNem976+B+eDuLIjesiQ==
   dependencies:
     "@babel/code-frame" "^7.22.13"
-    "@babel/generator" "^7.23.0"
+    "@babel/generator" "^7.23.3"
     "@babel/helper-environment-visitor" "^7.22.20"
     "@babel/helper-function-name" "^7.23.0"
     "@babel/helper-hoist-variables" "^7.22.5"
     "@babel/helper-split-export-declaration" "^7.22.6"
-    "@babel/parser" "^7.23.0"
-    "@babel/types" "^7.23.0"
+    "@babel/parser" "^7.23.3"
+    "@babel/types" "^7.23.3"
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/types@^7.22.15", "@babel/types@^7.22.19", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.4.4":
-  version "7.23.0"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.0.tgz#8c1f020c9df0e737e4e247c0619f58c68458aaeb"
-  integrity sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==
+"@babel/types@^7.22.15", "@babel/types@^7.22.19", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.23.3", "@babel/types@^7.4.4":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.3.tgz#d5ea892c07f2ec371ac704420f4dcdb07b5f9598"
+  integrity sha512-OZnvoH2l8PK5eUvEcUyCt/sXgr/h+UWpVuBbOljwcrAgUl6lpchoQ++PHGyQy1AtYnVA6CEq3y5xeEI10brpXw==
   dependencies:
     "@babel/helper-string-parser" "^7.22.5"
     "@babel/helper-validator-identifier" "^7.22.20"
@@ -1254,9 +1262,9 @@
   integrity sha512-H9XAx3hc0BQHY6l+IFSWHDySypcXsvsuLhgYLUGywmJ5pswRVQJUHpOsobnLYp2ZUaUlKiKDrgWWhosOwAEM8Q==
 
 "@ionic/cli-framework-output@^2.2.1", "@ionic/cli-framework-output@^2.2.5":
-  version "2.2.6"
-  resolved "https://registry.yarnpkg.com/@ionic/cli-framework-output/-/cli-framework-output-2.2.6.tgz#abbbe4982e82a9a4bfab3d34c372447cd48f25b3"
-  integrity sha512-YLPRwnk5Lw0XQ9pKWG+p2KoR5HjMBigZ6yv+/XtL3TGOnCS1+oAz56ABbAORCjTWhSJQisr8APNFiELAecY6QA==
+  version "2.2.7"
+  resolved "https://registry.yarnpkg.com/@ionic/cli-framework-output/-/cli-framework-output-2.2.7.tgz#eb2b683301201abeb0a7a0fc0cbc9eb5b5c894ca"
+  integrity sha512-/BXeclqu3y+bsBF7VFRS9xtNbrXf2JYCj/LeJoyLpWA9PeXNfvFrn91W2lwS2HVDjEDWKl4Ye6edJDdtn76EnA==
   dependencies:
     "@ionic/utils-terminal" "2.3.4"
     debug "^4.0.0"
@@ -1270,7 +1278,7 @@
     debug "^4.0.0"
     tslib "^2.0.1"
 
-"@ionic/utils-fs@3.1.7", "@ionic/utils-fs@^3.1.5", "@ionic/utils-fs@^3.1.6", "@ionic/utils-fs@^3.1.7":
+"@ionic/utils-fs@3.1.7", "@ionic/utils-fs@^3.1.5", "@ionic/utils-fs@^3.1.6":
   version "3.1.7"
   resolved "https://registry.yarnpkg.com/@ionic/utils-fs/-/utils-fs-3.1.7.tgz#e0d41225272c346846867e88a0b84b1a4ee9d9c9"
   integrity sha512-2EknRvMVfhnyhL1VhFkSLa5gOcycK91VnjfrTB0kbqkTFCOXyXgVLI5whzq7SLrgD9t1aqos3lMMQyVzaQ5gVA==
@@ -1309,9 +1317,9 @@
     tslib "^2.0.1"
 
 "@ionic/utils-subprocess@^2.1.11", "@ionic/utils-subprocess@^2.1.6", "@ionic/utils-subprocess@^2.1.8":
-  version "2.1.12"
-  resolved "https://registry.yarnpkg.com/@ionic/utils-subprocess/-/utils-subprocess-2.1.12.tgz#08ef08a13928aa97b9156b153e39fe5ff9c1e661"
-  integrity sha512-N05Y+dIXBHofKWJTheCMzVqmgY9wFmZcRv/LdNnfXaaA/mxLTyGxQYeig8fvQXTtDafb/siZXcrTkmQ+y6n3Yg==
+  version "2.1.14"
+  resolved "https://registry.yarnpkg.com/@ionic/utils-subprocess/-/utils-subprocess-2.1.14.tgz#06224bdc6d9891ed86b1e556fc172a0eeabdc846"
+  integrity sha512-nGYvyGVjU0kjPUcSRFr4ROTraT3w/7r502f5QJEsMRKTqa4eEzCshtwRk+/mpASm0kgBN5rrjYA5A/OZg8ahqg==
   dependencies:
     "@ionic/utils-array" "2.1.6"
     "@ionic/utils-fs" "3.1.7"
@@ -1322,7 +1330,7 @@
     debug "^4.0.0"
     tslib "^2.0.1"
 
-"@ionic/utils-terminal@2.3.4", "@ionic/utils-terminal@^2.3.0", "@ionic/utils-terminal@^2.3.3", "@ionic/utils-terminal@^2.3.4":
+"@ionic/utils-terminal@2.3.4", "@ionic/utils-terminal@^2.3.0", "@ionic/utils-terminal@^2.3.3":
   version "2.3.4"
   resolved "https://registry.yarnpkg.com/@ionic/utils-terminal/-/utils-terminal-2.3.4.tgz#e40c44b676265ed6a07a68407bda6e135870f879"
   integrity sha512-cEiMFl3jklE0sW60r8JHH3ijFTwh/jkdEKWbylSyExQwZ8pPuwoXz7gpkWoJRLuoRHHSvg+wzNYyPJazIHfoJA==
@@ -1446,16 +1454,16 @@
     prettier ">=2.4.0"
 
 "@revenuecat/purchases-capacitor@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@revenuecat/purchases-capacitor/-/purchases-capacitor-7.0.0.tgz#1828b34e3d354f0b94eb937815a1cacde2a3358d"
-  integrity sha512-rVOyugeZl7SyvluJU2M8xcSWCRDlF/V/1yzGh0W5rN7bNLJIefNHu3I5u28bNp47DeNW1wYH658x0SEBRWcvig==
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@revenuecat/purchases-capacitor/-/purchases-capacitor-7.1.0.tgz#74f3388b18dec199a6e1f60af1d293b556cd6544"
+  integrity sha512-wXUixYk26r4gxAy56lZ0SFZ0MrJfZy2iH+v6pfeINq2APfaoX0xkIK0Sf00kx+6+H7wDrTuli5gBujbsCRkZGg==
   dependencies:
-    "@revenuecat/purchases-typescript-internal-esm" "7.0.0"
+    "@revenuecat/purchases-typescript-internal-esm" "7.3.0"
 
-"@revenuecat/purchases-typescript-internal-esm@7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@revenuecat/purchases-typescript-internal-esm/-/purchases-typescript-internal-esm-7.0.0.tgz#f751b72eaaf08b8bb4296a59891174c1e14bbf03"
-  integrity sha512-f4Py3SrXsgFAPDU+33+ceq5zg3zjSfyHpxkpMDlLFXtb1eE3XK64UCzAO5nHV5n0hLswMPvzJfVJxWLOz2S/TQ==
+"@revenuecat/purchases-typescript-internal-esm@7.3.0":
+  version "7.3.0"
+  resolved "https://registry.yarnpkg.com/@revenuecat/purchases-typescript-internal-esm/-/purchases-typescript-internal-esm-7.3.0.tgz#8650f801b0d447eff4efb4efcdc20bef010db92b"
+  integrity sha512-KVH5lFZCo1105DkK4zFy4oNK3u4Aggh4ahJx0z9q3EqQsuaKMWzo84V2pc9/RUXxoEdyhUnBwvv1IbmaAPgRWA==
 
 "@rollup/plugin-babel@^5.2.0":
   version "5.3.1"
@@ -1595,28 +1603,28 @@
   integrity sha512-Xn8k62yJrTGleinKIIlasl7IuMWzt933qA0r/9qh8s7aoIzXkX6hQ31r0glpe7dy6ytKEEwua1TrT6ZCK5rmsg==
 
 "@types/chai-subset@^1.3.3":
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/@types/chai-subset/-/chai-subset-1.3.4.tgz#7938fa929dd12db451457e4d6faa27bcd599a729"
-  integrity sha512-CCWNXrJYSUIojZ1149ksLl3AN9cmZ5djf+yUoVVV+NuYrtydItQVlL2ZDqyC6M6O9LWRnVf8yYDxbXHO2TfQZg==
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/@types/chai-subset/-/chai-subset-1.3.5.tgz#3fc044451f26985f45625230a7f22284808b0a9a"
+  integrity sha512-c2mPnw+xHtXDoHmdtcCXGwyLMiauiAyxWMzhGpqHC4nqI/Y5G2XhTampslK2rb59kpcuHon03UH8W6iYUzw88A==
   dependencies:
     "@types/chai" "*"
 
 "@types/chai@*", "@types/chai@^4.3.5":
-  version "4.3.9"
-  resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.3.9.tgz#144d762491967db8c6dea38e03d2206c2623feec"
-  integrity sha512-69TtiDzu0bcmKQv3yg1Zx409/Kd7r0b5F1PfpYJfSHzLGtB53547V4u+9iqKYsTu/O2ai6KTb0TInNpvuQ3qmg==
+  version "4.3.10"
+  resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.3.10.tgz#2ad2959d1767edee5b0e4efb1a0cd2b500747317"
+  integrity sha512-of+ICnbqjmFCiixUnqRulbylyXQrPqIGf/B3Jax1wIF3DvSheysQxAWvqHhZiW3IQrycvokcLcFQlveGp+vyNg==
 
 "@types/cross-spawn@^6.0.2":
-  version "6.0.4"
-  resolved "https://registry.yarnpkg.com/@types/cross-spawn/-/cross-spawn-6.0.4.tgz#e658d29e2308a01f48b7b30fd8cdf07aeb2e5a82"
-  integrity sha512-GGLpeThc2Bu8FBGmVn76ZU3lix17qZensEI4/MPty0aZpm2CHfgEMis31pf5X5EiudYKcPAsWciAsCALoPo5dw==
+  version "6.0.5"
+  resolved "https://registry.yarnpkg.com/@types/cross-spawn/-/cross-spawn-6.0.5.tgz#1f9a5311e0e54d6f88017ba6d564a958d1aa359f"
+  integrity sha512-wsIMP68FvGXk+RaWhraz6Xp4v7sl4qwzHAmtPaJEN2NRTXXI9LtFawUpeTsBNL/pd6QoLStdytCaAyiK7AEd/Q==
   dependencies:
     "@types/node" "*"
 
 "@types/diff@^5.0.2":
-  version "5.0.7"
-  resolved "https://registry.yarnpkg.com/@types/diff/-/diff-5.0.7.tgz#471bad8be0d911ed04d115863402920f3a84079c"
-  integrity sha512-adBosR2GntaQQiuHnfRN9HtxYpoHHJBcdyz7VSXhjpSAmtvIfu/S1fjTqwuIx/Ypba6LCZdfWIqPYx2BR5TneQ==
+  version "5.0.8"
+  resolved "https://registry.yarnpkg.com/@types/diff/-/diff-5.0.8.tgz#28dc501cc3e7c62d4c5d096afe20755170acf276"
+  integrity sha512-kR0gRf0wMwpxQq6ME5s+tWk9zVCfJUl98eRkD05HWWRbhPB/eu4V1IbyZAsvzC1Gn4znBJ0HN01M4DGXdBEV8Q==
 
 "@types/estree@0.0.39":
   version "0.0.39"
@@ -1624,9 +1632,9 @@
   integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==
 
 "@types/fs-extra@^8.0.0":
-  version "8.1.4"
-  resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-8.1.4.tgz#8171df1d16a80d69fc9c3aab07d7961349a5cb8b"
-  integrity sha512-OMcQKnlrkrOI0TaZ/MgVDA8LYFl7CykzFsjMj9l5x3un2nFxCY20ZFlnqrM0lcqlbs0Yro2HbnZlmopyRaoJ5w==
+  version "8.1.5"
+  resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-8.1.5.tgz#33aae2962d3b3ec9219b5aca2555ee00274f5927"
+  integrity sha512-0dzKcwO+S8s2kuF5Z9oUWatQJj5Uq/iqphEtE3GQJVRRYm/tD1LglU2UnXi2A8jLq5umkGouOXOR9y0n613ZwQ==
   dependencies:
     "@types/node" "*"
 
@@ -1638,14 +1646,14 @@
     "@types/node" "*"
 
 "@types/hammerjs@^2.0.42":
-  version "2.0.43"
-  resolved "https://registry.yarnpkg.com/@types/hammerjs/-/hammerjs-2.0.43.tgz#8660dd1e0e5fd979395e2f999e670cdb9484d1e9"
-  integrity sha512-wqxfwHk83RS7+6OpytGdo5wqkqtvx+bGaIs1Rwm5NrtQHUfL4OgWs/5p0OipmjmT+fexePh37Ek+mqIpdNjQKA==
+  version "2.0.44"
+  resolved "https://registry.yarnpkg.com/@types/hammerjs/-/hammerjs-2.0.44.tgz#d90637ee049c4cf44cd8fa0072afca2124f947be"
+  integrity sha512-pdGBkAh4ggfXAkiwgmTdROJe3mwvLWJYm6JiaAwCtskAU0Weh+JQyyMTbhvxjxD2n8sr8PrxVwyDzmpnK4pUrQ==
 
 "@types/ini@^1.3.31":
-  version "1.3.32"
-  resolved "https://registry.yarnpkg.com/@types/ini/-/ini-1.3.32.tgz#6ebf95923d3b5afb95bfcf76a246da9fed26e48b"
-  integrity sha512-cCXfrhgTiChyYIBs7ZZdsi8a9JLs4vVdCsUJt8nczxpNcHcUEMO8Tu5vsMwbepDobKC1mOf4w32jgOz1NEDoaA==
+  version "1.3.33"
+  resolved "https://registry.yarnpkg.com/@types/ini/-/ini-1.3.33.tgz#d5f885e5da6dcb1a3ee9133d84a823d4a046fe25"
+  integrity sha512-YZDzdPTDxy084i5eVxUKfAHLenhAMVHupzCIg1dzFJNs6xp/UGyWk+8Lp1YxoZH+Hvv7C9OcHEDPndSMwaPVsQ==
 
 "@types/jest@^27.0.2":
   version "27.5.2"
@@ -1656,14 +1664,14 @@
     pretty-format "^27.0.0"
 
 "@types/json-schema@^7.0.9":
-  version "7.0.14"
-  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.14.tgz#74a97a5573980802f32c8e47b663530ab3b6b7d1"
-  integrity sha512-U3PUjAudAdJBeC2pgN8uTIKgxrb4nlDF3SF0++EldXQvQBGkpFZMSnwQiIoDU77tv45VgNkl/L4ouD+rEomujw==
+  version "7.0.15"
+  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841"
+  integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==
 
 "@types/lodash@^4.14.175":
-  version "4.14.200"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.200.tgz#435b6035c7eba9cdf1e039af8212c9e9281e7149"
-  integrity sha512-YI/M/4HRImtNf3pJgbF+W6FrXovqj+T+/HpENLTooK9PnkacBsDpeP3IpHab40CClUfhNmdM2WTNP2sa2dni5Q==
+  version "4.14.201"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.201.tgz#76f47cb63124e806824b6c18463daf3e1d480239"
+  integrity sha512-y9euML0cim1JrykNxADLfaG0FgD1g/yTHwUs/Jg9ZIU7WKj2/4IW9Lbb1WZbvck78W/lfGXFfe+u2EGfIJXdLQ==
 
 "@types/marked@^4.0.7":
   version "4.3.2"
@@ -1671,26 +1679,26 @@
   integrity sha512-a79Yc3TOk6dGdituy8hmTTJXjOkZ7zsFYV10L337ttq/rec8lRMDBpV7fL3uLx6TgbFCa5DU/h8FmIBQPSbU0w==
 
 "@types/minimist@^1.2.0":
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.4.tgz#81f886786411c45bba3f33e781ab48bd56bfca2e"
-  integrity sha512-Kfe/D3hxHTusnPNRbycJE1N77WHDsdS4AjUYIzlDzhDrS47NrwuL3YW4VITxwR7KCVpzwgy4Rbj829KSSQmwXQ==
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.5.tgz#ec10755e871497bcd83efe927e43ec46e8c0747e"
+  integrity sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag==
 
 "@types/node@*":
-  version "20.8.10"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.8.10.tgz#a5448b895c753ae929c26ce85cab557c6d4a365e"
-  integrity sha512-TlgT8JntpcbmKUFzjhsyhGfP2fsiz1Mv56im6enJ905xG1DAYesxJaeSbGqQmAw8OWPdhyJGhGSQGKRNJ45u9w==
+  version "20.9.0"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.9.0.tgz#bfcdc230583aeb891cf51e73cfdaacdd8deae298"
+  integrity sha512-nekiGu2NDb1BcVofVcEKMIwzlx4NjHlcjhoxxKBNLtz15Y1z7MYf549DFvkHSId02Ax6kGwWntIBPC3l/JZcmw==
   dependencies:
     undici-types "~5.26.4"
 
 "@types/normalize-package-data@^2.4.0":
-  version "2.4.3"
-  resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.3.tgz#291c243e4b94dbfbc0c0ee26b7666f1d5c030e2c"
-  integrity sha512-ehPtgRgaULsFG8x0NeYJvmyH1hmlfsNLujHe9dQEia/7MAJYdzMSi19JtchUHjmBA6XC/75dK55mzZH+RyieSg==
+  version "2.4.4"
+  resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz#56e2cc26c397c038fab0e3a917a12d5c5909e901"
+  integrity sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==
 
 "@types/plist@^3.0.2":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@types/plist/-/plist-3.0.4.tgz#af0c5ffaf30d2302460adc17861021323c1410f9"
-  integrity sha512-pTa9xUFQFM9WJGSWHajYNljD+DbVylE1q9IweK1LBhUYJdJ28YNU8j3KZ4Q1Qw+cSl4+QLLLOVmqNjhhvVO8fA==
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/@types/plist/-/plist-3.0.5.tgz#9a0c49c0f9886c8c8696a7904dd703f6284036e0"
+  integrity sha512-E6OCaRmAe4WDmWNsL/9RMqdkkzDCY1etutkflWk4c+AcjDU07Pcz1fQwTX0TQz+Pxqn9i4L1TU3UFpjnrcDgxA==
   dependencies:
     "@types/node" "*"
     xmlbuilder ">=11.0.1"
@@ -1703,9 +1711,9 @@
     "@types/node" "*"
 
 "@types/semver@^7.3.12":
-  version "7.5.4"
-  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.4.tgz#0a41252ad431c473158b22f9bfb9a63df7541cff"
-  integrity sha512-MMzuxN3GdFwskAnb6fz0orFvhfqi752yjaXylr0Rp4oDg5H0Zn1IuyRhDVvYOwAXoJirx2xuS16I3WjxnAIHiQ==
+  version "7.5.5"
+  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.5.tgz#deed5ab7019756c9c90ea86139106b0346223f35"
+  integrity sha512-+d+WYC1BxJ6yVOgUgzK8gWvp5qF8ssV5r4nsDcZWKRWcDQLQ619tvWAxJQYGgBrO1MnLJC7a5GtiYsAoQ47dJg==
 
 "@types/slice-ansi@^4.0.0":
   version "4.0.0"
@@ -1713,14 +1721,14 @@
   integrity sha512-+OpjSaq85gvlZAYINyzKpLeiFkSC4EsC6IIiT6v6TLSU5k5U83fHGj9Lel8oKEXM0HqgrMVCjXPDPVICtxF7EQ==
 
 "@types/slice-ansi@^5.0.0":
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/@types/slice-ansi/-/slice-ansi-5.0.1.tgz#1593be2f6a7b09561de377e0e6f4728e314aa792"
-  integrity sha512-GEwprZg+tEst3Zd0wJChmew9mjbpCqOR1sR0CZ1Ht3XZYijJ2xoHHp8nLmjuF1Sldsj4S/1wDr3ey8eopRdgeA==
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/@types/slice-ansi/-/slice-ansi-5.0.2.tgz#7ae600f4cd0913ec91b3e81560cd161b9486bd9c"
+  integrity sha512-IfxMqRjS0zNRHlbDgfMnYRW4LgYMjb+0XeVuMrC0H7/krAGeaQFQ1A4ijuEpmXT+KUspgzjQ2wFUO+xuCZao4A==
 
 "@types/trusted-types@^2.0.2":
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@types/trusted-types/-/trusted-types-2.0.5.tgz#5cac7e7df3275bb95f79594f192d97da3b4fd5fe"
-  integrity sha512-I3pkr8j/6tmQtKV/ZzHtuaqYSQvyjGRKH4go60Rr0IDLlFxuRT5V32uvB1mecM5G1EVAUyF/4r4QZ1GHgz+mxA==
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/@types/trusted-types/-/trusted-types-2.0.6.tgz#d12451beaeb9c3838f12024580dc500b7e88b0ad"
+  integrity sha512-HYtNooPvUY9WAVRBr4u+4Qa9fYD1ze2IUlAD3HoA6oehn1taGwBx3Oa52U4mTslTS+GAExKpaFu39Y5xUEwfjg==
 
 "@types/xterm@^3.0.0":
   version "3.0.0"
@@ -2912,9 +2920,9 @@ ejs@^3.1.6:
     jake "^10.8.5"
 
 electron-to-chromium@^1.4.535:
-  version "1.4.576"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.576.tgz#0c6940fdc0d60f7e34bd742b29d8fa847c9294d1"
-  integrity sha512-yXsZyXJfAqzWk1WKryr0Wl0MN2D47xodPvEEwlVePBnhU5E7raevLQR+E6b9JAD3GfL/7MbAL9ZtWQQPcLx7wA==
+  version "1.4.581"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.581.tgz#23b684c67bf56d4284e95598c05a5d266653b6d8"
+  integrity sha512-6uhqWBIapTJUxgPTCHH9sqdbxIMPt7oXl0VcAL1kOtlU6aECdcMncCrX5Z7sHQ/invtrC9jUQUef7+HhO8vVFw==
 
 elementtree@^0.1.7:
   version "0.1.7"
@@ -3198,9 +3206,9 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
 fast-glob@^3.2.9, fast-glob@^3.3.1:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.1.tgz#784b4e897340f3dbbef17413b3f11acf03c874c4"
-  integrity sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.2.tgz#a904501e57cfdd2ffcded45e99a54fef55e46129"
+  integrity sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==
   dependencies:
     "@nodelib/fs.stat" "^2.0.2"
     "@nodelib/fs.walk" "^1.2.3"
@@ -3277,9 +3285,9 @@ find-up@^5.0.0:
     path-exists "^4.0.0"
 
 flat-cache@^3.0.4:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.1.1.tgz#a02a15fdec25a8f844ff7cc658f03dd99eb4609b"
-  integrity sha512-/qM2b3LUIaIgviBQovTLvijfyOQXPtSRnRK26ksj2J7rzPIecePUIpJsZ4T02Qg+xiAEKIs5K8dsHEd+VaKa/Q==
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.2.0.tgz#2c0c2d5040c99b1632771a9d105725c0115363ee"
+  integrity sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==
   dependencies:
     flatted "^3.2.9"
     keyv "^4.5.3"
@@ -3742,11 +3750,6 @@ ini@^3.0.1:
   resolved "https://registry.yarnpkg.com/ini/-/ini-3.0.1.tgz#c76ec81007875bc44d544ff7a11a55d12294102d"
   integrity sha512-it4HyVAUTKBc6m8e1iXWvXSTdndF7HbdN713+kvLrymxTaU4AUBWrJ4vEooP+V7fexnVD3LKcBshjGGPefSMUQ==
 
-ini@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-4.1.1.tgz#d95b3d843b1e906e56d6747d5447904ff50ce7a1"
-  integrity sha512-QQnnxNyfvmHFIsj7gkPcYymR8Jdw/o7mp5ZFihxn6h8Ci6fh3Dx4E1gPjpQEpIuPo9XVNY/ZUwh4BPMjGyL01g==
-
 internal-slot@^1.0.5:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.6.tgz#37e756098c4911c5e912b8edbf71ed3aa116f930"
@@ -4264,9 +4267,11 @@ lru-cache@^6.0.0:
     yallist "^4.0.0"
 
 "lru-cache@^9.1.1 || ^10.0.0":
-  version "10.0.1"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.0.1.tgz#0a3be479df549cca0e5d693ac402ff19537a6b7a"
-  integrity sha512-IJ4uwUTi2qCccrioU6g9g/5rvvVl13bsdczUUcqbciD9iLr095yj8DQKdObriEvuNSx325N1rV1O0sJFszx75g==
+  version "10.0.2"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.0.2.tgz#34504678cc3266b09b8dfd6fab4e1515258271b7"
+  integrity sha512-Yj9mA8fPiVgOUpByoTZO5pNrcl5Yk37FcSHsUINpAsaBIEZIuqcCclDZJCVxqQShDsmYX8QG63svJiTbOATZwg==
+  dependencies:
+    semver "^7.3.5"
 
 magic-string@^0.25.0, magic-string@^0.25.7:
   version "0.25.9"
@@ -4490,16 +4495,16 @@ ms@^2.1.1:
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
 
 nanoid@^3.3.6:
-  version "3.3.6"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.6.tgz#443380c856d6e9f9824267d960b4236ad583ea4c"
-  integrity sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==
+  version "3.3.7"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8"
+  integrity sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==
 
 napi-build-utils@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.2.tgz#b1fddc0b2c46e380a0b7a76f984dd47c41a13806"
   integrity sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==
 
-native-run@^1.5.0, native-run@^1.7.3:
+native-run@^1.5.0, native-run@^1.7.3, native-run@^1.7.4:
   version "1.7.4"
   resolved "https://registry.yarnpkg.com/native-run/-/native-run-1.7.4.tgz#b98b74812805cef8665cfceec651e66e662123e3"
   integrity sha512-yDEwTp66vmXpqFiSQzz4sVQgyq5U58gGRovglY4GHh12ITyWa6mh6Lbpm2gViVOVD1JYFtYnwcgr7GTFBinXNA==
@@ -4516,21 +4521,6 @@ native-run@^1.5.0, native-run@^1.7.3:
     tslib "^2.4.0"
     yauzl "^2.10.0"
 
-"native-run@file:../native-run":
-  version "2.0.0"
-  dependencies:
-    "@ionic/utils-fs" "^3.1.7"
-    "@ionic/utils-terminal" "^2.3.4"
-    bplist-parser "^0.3.2"
-    debug "^4.3.4"
-    elementtree "^0.1.7"
-    ini "^4.1.1"
-    plist "^3.1.0"
-    split2 "^4.2.0"
-    through2 "^4.0.2"
-    tslib "^2.6.2"
-    yauzl "^2.10.0"
-
 natural-compare-lite@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz#17b09581988979fddafe0201e931ba933c96cbb4"
@@ -4901,7 +4891,7 @@ playwright@1.39.0:
   optionalDependencies:
     fsevents "2.3.2"
 
-plist@^3.0.2, plist@^3.0.4, plist@^3.0.5, plist@^3.0.6, plist@^3.1.0:
+plist@^3.0.2, plist@^3.0.4, plist@^3.0.5, plist@^3.0.6:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/plist/-/plist-3.1.0.tgz#797a516a93e62f5bde55e0b9cc9c967f860893c9"
   integrity sha512-uysumyrvkUX0rX/dEVqt8gC3sTBzd4zoWfLeS29nb53imdaXVvLINYXTI2GNqzaMuvacNx4uJQ8+b3zXR0pkgQ==
@@ -4943,9 +4933,9 @@ prelude-ls@^1.2.1:
   integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
 
 prettier@>=2.4.0:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.0.3.tgz#432a51f7ba422d1469096c0fdc28e235db8f9643"
-  integrity sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.1.0.tgz#c6d16474a5f764ea1a4a373c593b779697744d5e"
+  integrity sha512-TQLvXjq5IAibjh8EpBIkNKxO749UEWABoiIZehEPiY4GNpVdhaFKqSTu+QrlU6D2dPAfubRmtJTi4K4YkQ5eXw==
 
 prettier@^2.7.1:
   version "2.8.8"
@@ -5554,7 +5544,7 @@ split2@^3.0.0:
   dependencies:
     readable-stream "^3.0.0"
 
-split2@^4.1.0, split2@^4.2.0:
+split2@^4.1.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/split2/-/split2-4.2.0.tgz#c9c5920904d148bab0b9f67145f245a86aadbfa4"
   integrity sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==
@@ -5923,7 +5913,7 @@ tslib@^1.8.1:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
-tslib@^2.0.1, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.4.0, tslib@^2.6.2:
+tslib@^2.0.1, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.4.0:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae"
   integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==

From 19f68ff4e43d84c02989395d923014cbbf99acea Mon Sep 17 00:00:00 2001
From: Benny Daon <benny@tuzig.com>
Date: Tue, 14 Nov 2023 12:38:17 +0200
Subject: [PATCH 42/53] Polishing & Restoring un related changes

---
 aatp/peerbook_webrtc/admin.spec.ts | 12 ++++++-----
 index.html                         |  2 +-
 ios/App/Podfile.lock               | 18 ++++++++--------
 package.json                       |  2 +-
 src/commands.ts                    |  9 +++++---
 src/gate.ts                        | 33 ++++++++++++++++++++++--------
 src/peerbook.ts                    |  2 +-
 src/shell.ts                       |  3 +++
 src/webrtc_session.ts              | 22 +++++++++++---------
 yarn.lock                          | 18 ++++++++--------
 10 files changed, 74 insertions(+), 47 deletions(-)

diff --git a/aatp/peerbook_webrtc/admin.spec.ts b/aatp/peerbook_webrtc/admin.spec.ts
index 3ccd1fa9..888974f2 100644
--- a/aatp/peerbook_webrtc/admin.spec.ts
+++ b/aatp/peerbook_webrtc/admin.spec.ts
@@ -328,11 +328,13 @@ test.describe('peerbook administration', ()  => {
         await page.keyboard.press("Enter")
         await page.keyboard.type('testclient')
         await page.keyboard.press("Enter")
-        // TODO: optimize this sleep. 5 second is the max time it takes for the
-        // client to be logged in. We should have a retry loop instead.
-        await sleep(5000)
         const fp = await page.evaluate(() => terminal7.getFingerprint())
-        expect(await redisClient.hGet(`peer:${fp}`, "user")).toBe(uid)
+        let peerUID = await redisClient.hGet(`peer:${fp}`, "user")
+        while (!peerUID) {
+            await sleep(100)
+            peerUID = await redisClient.hGet(`peer:${fp}`, "user")
+        }
+        expect(peerUID).toBe(uid)
         twr = await getTWRBuffer(page)
         await page.screenshot({ path: '/result/4.png' })
         expect(twr).toMatch(/Email sent/)
@@ -356,7 +358,7 @@ test.describe('peerbook administration', ()  => {
         await verifyPage.click('button[type="submit"]')
         // TODO: optimize this sleep. 5 second is the max time it takes for the
         // client to be logged in. We should have a retry loop instead.
-        await sleep(5000)
+        await sleep(2000)
         const twr = await getTWRBuffer(page)
         await page.screenshot({ path: '/result/5.png' })
         expect(twr).toMatch(/Logged in/)
diff --git a/index.html b/index.html
index 1f07c0fc..4654fdf2 100644
--- a/index.html
+++ b/index.html
@@ -61,7 +61,7 @@ <h1 id="title-short">T7</h1>
                   <li>
                       &#x1F4D6; &nbsp;
                       <a id="peerbook-legend">
-                       PeerBook
+                      PeerBook
                       <span id="peerbook-status" class="status">🚧</span>
                       </a>
                     </li>
diff --git a/ios/App/Podfile.lock b/ios/App/Podfile.lock
index 6469c67c..7d930bb3 100644
--- a/ios/App/Podfile.lock
+++ b/ios/App/Podfile.lock
@@ -28,12 +28,12 @@ PODS:
   - CapacitorStatusBar (5.0.6):
     - Capacitor
   - NMSSHT7 (2.9.1)
-  - PurchasesHybridCommon (7.3.0):
-    - RevenueCat (= 4.30.2)
-  - RevenueCat (4.30.2)
-  - RevenuecatPurchasesCapacitor (7.1.0):
+  - PurchasesHybridCommon (7.0.0):
+    - RevenueCat (= 4.27.0)
+  - RevenueCat (4.27.0)
+  - RevenuecatPurchasesCapacitor (7.0.0):
     - Capacitor
-    - PurchasesHybridCommon (= 7.3.0)
+    - PurchasesHybridCommon (= 7.0.0)
 
 DEPENDENCIES:
   - "Capacitor (from `../../node_modules/@capacitor/ios`)"
@@ -106,10 +106,10 @@ SPEC CHECKSUMS:
   CapacitorSshPlugin: 79f67cb26d40bd0c07cec6dda93d93d5faf7b614
   CapacitorStatusBar: 565c0a1ebd79bb40d797606a8992b4a105885309
   NMSSHT7: 67f9d8f43b40b997728761b4cf2aa7ea660ba7c2
-  PurchasesHybridCommon: a3101e0f94de9bf872a67a6511ecaa932fdef02e
-  RevenueCat: bedd1226d8081830838fb492603cc96349a24f34
-  RevenuecatPurchasesCapacitor: cf268ba90377d12f49e6b003244a0c0fa87b1a80
+  PurchasesHybridCommon: af3b2413f9cb999bc1fdca44770bdaf39dfb89fa
+  RevenueCat: 84fbe2eb9bbf63e1abf346ccd3ff9ee45d633e3b
+  RevenuecatPurchasesCapacitor: c0de310959a58b3217acd7ec5ce981175bb050b1
 
 PODFILE CHECKSUM: b1f79f7d62e59482e73924f44c49c50186ac72be
 
-COCOAPODS: 1.12.1
+COCOAPODS: 1.11.3
diff --git a/package.json b/package.json
index 8f8eed74..eaed4252 100644
--- a/package.json
+++ b/package.json
@@ -79,7 +79,7 @@
     "build": "vite build -c vite.dev.config.js",
     "clean": "rm -rf dist ios/App/App/public/*",
     "aatp": "bash ./aatp/run",
-    "lint": "npx eslint aatp src --ext .js,.ts && npx tsc --noEmit --target es2022 --moduleResolution node src/*.ts"
+    "lint": "npx eslint aatp src --ext .js,.ts && npx tsc --skipLibCheck --noEmit --target es2022 --moduleResolution node src/*.ts"
   },
   "repository": {
     "type": "git",
diff --git a/src/commands.ts b/src/commands.ts
index 94096520..6347dc57 100644
--- a/src/commands.ts
+++ b/src/commands.ts
@@ -335,8 +335,6 @@ async function addCMD(shell: Shell) {
 }
 
 async function resetCMD(shell: Shell, args: string[]) {
-    terminal7.recovering = false
-    terminal7.ignoreAppEvents = false
     let gate: Gate
     if (args[0]) {
         gate = shell.getGate(args[0])
@@ -514,6 +512,8 @@ async function editCMD(shell:Shell, args: string[]) {
             gateAttrs.filter((_, i) => enabled[i])
                      .forEach((k, i) => 
                         gate[k] = (k == 'onlySSH')?res[i] == 'y':res[i])
+            gate.t7.storeGates()
+            gate.updateNameE()
             break
         case "\x1B[31mDelete\x1B[0m":
             res = await shell.runForm(fDel, "text")
@@ -989,7 +989,10 @@ async function loginCMD(shell: Shell) {
         await new Promise(r => setTimeout(r, 2000))
         try {
             await terminal7.pb.connect()
-        } catch(e) {}
+        } catch(e) {
+            terminal7.log("Failed to connect to PeerBook", e)
+        }
+
     }
     if (timedOut) {
         shell.t.writeln("Login timed out, please try again")
diff --git a/src/gate.ts b/src/gate.ts
index 366eb0aa..d3e0bff4 100644
--- a/src/gate.ts
+++ b/src/gate.ts
@@ -224,6 +224,7 @@ export class Gate {
         this.stopBoarding()
         this.map.shell.stopWatchdog()
         let password: string
+        let firstGate: string | null
         switch ( failure ) {
             case Failure.WrongPassword:
                 this.notify("Sorry, wrong password")
@@ -281,6 +282,9 @@ export class Gate {
                     this.onFailure(Failure.Aborted)
                     return 
                 }
+                firstGate = (await Preferences.get({key: "first_gate"})).value
+                if (firstGate)
+                    terminal7.ignoreAppEvents = true
                 const session = this.session as SSHSession
                 session.passConnect(this.marker, password)
                 return
@@ -312,7 +316,8 @@ export class Gate {
                 resolve()
             }
             if (!isSSH && !isNative) {
-                this.session.reconnect(this.marker).then(layout => handleLauout(layout))
+                this.session.reconnect(this.marker)
+                .then(layout => handleLauout(layout))
                 .catch(() => {
                     if (this.session) {
                         this.session.close()
@@ -330,10 +335,19 @@ export class Gate {
                 }
                 this.map.shell.onDisconnect(this, isSSH).then(resolve).catch(reject)
             }
-            this.session.reconnect(this.marker).then(layout => handleLauout(layout))
-            .catch(e => {
+            this.t7.readId().then(({publicKey, privateKey}) => {
+                this.session.reconnect(this.marker, publicKey, privateKey)
+                .then(layout => handleLauout(layout))
+                .catch(e => {
+                    closeSessionAndDisconnect()
+                    this.t7.log("reconnect failed, calling the shell to handle it", isSSH, e)
+                    reject(e)
+                })
+            }).catch((e) => {
+                this.t7.log("failed to read id", e)
                 closeSessionAndDisconnect()
                 this.t7.log("reconnect failed, calling the shell to handle it", isSSH, e)
+                reject(e)
             })
         })
     }
@@ -342,10 +356,6 @@ export class Gate {
      */
     async connect(onConnected = () => this.load()) {
         
-        /*
-        if (!terminal7.netConnected)
-            return
-            */
         this.onConnected = onConnected
         this.t7.activeG = this // TODO: move this out of here
         this.connectionFailed = false
@@ -718,6 +728,10 @@ export class Gate {
             if (this.session.isSSH) {
                 try {
                     const {publicKey, privateKey} = await this.t7.readId()
+                    const firstGate = (await Preferences.get({key: "first_gate"})).value
+                    if (firstGate)
+                        terminal7.ignoreAppEvents = true
+
                     const session = this.session as SSHSession
                     await session.connect(this.marker, publicKey, privateKey)
                 } catch(e) {
@@ -734,7 +748,10 @@ export class Gate {
             let layout: ServerPayload | null = null
             try {
                 layout = JSON.parse(payload)
-            } catch(e) {}
+            } catch(e) {
+                this.notify("Failed to load layout")
+                layout = null
+            }
             console.log("got payload", layout)
             this.setLayout(layout)
         })
diff --git a/src/peerbook.ts b/src/peerbook.ts
index 1e0f5197..0c2ad261 100644
--- a/src/peerbook.ts
+++ b/src/peerbook.ts
@@ -73,7 +73,7 @@ export class PeerbookConnection {
                 console.log("Admin command with no session", cmd)
                 this.connect({firstMsg: cmd}).then(() => {
                     console.log("Connected, resolving")
-                    resolve()
+                    resolve("")
                 }).catch(e => {
                     console.log("Failed to connect")
                     reject(e)
diff --git a/src/shell.ts b/src/shell.ts
index f47da96d..193b6e86 100644
--- a/src/shell.ts
+++ b/src/shell.ts
@@ -118,6 +118,9 @@ export class Shell {
     async execute(cmd: string, args: string[]) {
         if (!cmd)
             return
+        // just in case - these flags can get us stuck
+        terminal7.recovering = false
+        terminal7.ignoreAppEvents = false
         this.t.write("\x1B[K") // clear line
         let exec = null
         for (const c of this.commands) {
diff --git a/src/webrtc_session.ts b/src/webrtc_session.ts
index d21d2851..9238b973 100644
--- a/src/webrtc_session.ts
+++ b/src/webrtc_session.ts
@@ -114,6 +114,8 @@ export class WebRTCSession extends BaseSession {
             iceServers: this.t7.iceServers,
             certificates: this.t7.certificates})
         this.pc.onconnectionstatechange = () => {
+            if (!this.pc)
+                return
             const state = this.pc.connectionState
             console.log("new connection state", state, marker)
             if ((state === "connected") && (marker != null)) {
@@ -481,7 +483,7 @@ export class PeerbookSession extends WebRTCSession {
 export class HTTPWebRTCSession extends WebRTCSession {
     address: string
     headers: HttpHeaders
-    sessionUrl: string | null
+    sessionURL: string | null
     pendingCandidates: Array<RTCIceCandidate>
     // storing the setTimeout id so we can cancel it
     retryDelete: number | null = null
@@ -491,7 +493,7 @@ export class HTTPWebRTCSession extends WebRTCSession {
         this.headers = {}
         if (headers)
             headers.forEach((v, k) => this.headers[k] =  v)
-        this.sessionUrl = null
+        this.sessionURL = null
         console.log("new http webrtc session", address, JSON.stringify(this.headers))
     }
 
@@ -516,8 +518,8 @@ export class HTTPWebRTCSession extends WebRTCSession {
                 else
                     this.fail()
             } else if (response.status == 201) {
-                this.sessionUrl = response.headers['location'] || response.headers['Location']
-                console.log("got a session url", this.sessionUrl)
+                this.sessionURL = response.headers['location'] || response.headers['Location']
+                console.log("got a session url", this.sessionURL)
                 console.log("waiting candidates", this.pendingCandidates.length)
                 this.pendingCandidates.forEach(c => this.sendCandidate(c))
                 this.pendingCandidates = []
@@ -548,7 +550,7 @@ export class HTTPWebRTCSession extends WebRTCSession {
         })
     }
     sendCandidate(candidate: RTCIceCandidate) {
-        if (this.sessionUrl == null) {
+        if (this.sessionURL == null) {
             console.log("waiting for session url, queuing candidate")
             this.pendingCandidates.push(candidate)
             return
@@ -557,7 +559,7 @@ export class HTTPWebRTCSession extends WebRTCSession {
         Object.assign(headers, this.headers)
         headers['Content-Type'] = 'application/json'
         CapacitorHttp.patch({
-            url: this.sessionUrl, 
+            url: this.sessionURL, 
             headers: headers,
             readTimeout: 3000,
             connectTimeout: 3000,
@@ -587,9 +589,9 @@ export class HTTPWebRTCSession extends WebRTCSession {
         console.log("got ice candidate", ev)
         if (ev.candidate == null) {
             /*TODO: DELETE the session
-            if ((this.sessionUrl != null) && (this.pendingCandidates.length == 0)) {
+            if ((this.sessionURL != null) && (this.pendingCandidates.length == 0)) {
                 CapacitorHttp.delete({
-                    url: this.sessionUrl,
+                    url: this.sessionURL,
                     readTimeout: 3000,
                     connectTimeout: 3000,
                 })
@@ -610,9 +612,9 @@ export class HTTPWebRTCSession extends WebRTCSession {
     close(): void {
         clearTimeout(this.retryDelete)
         super.close()
-        if (this.sessionUrl != null) {
+        if (this.sessionURL != null) {
             CapacitorHttp.delete({
-                url: this.sessionUrl,
+                url: this.sessionURL,
                 readTimeout: 3000,
                 connectTimeout: 3000,
             })
diff --git a/yarn.lock b/yarn.lock
index 95530d0f..a6996369 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2263,9 +2263,9 @@ camelcase@^5.0.0, camelcase@^5.3.1:
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
 caniuse-lite@^1.0.30001541:
-  version "1.0.30001561"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001561.tgz#752f21f56f96f1b1a52e97aae98c57c562d5d9da"
-  integrity sha512-NTt0DNoKe958Q0BE0j0c1V9jbUzhBxHIEJy7asmGrpE0yG63KTV7PLHPnK2E1O9RsQrQ081I3NLuXGS6zht3cw==
+  version "1.0.30001562"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001562.tgz#9d16c5fd7e9c592c4cd5e304bc0f75b0008b2759"
+  integrity sha512-kfte3Hym//51EdX4239i+Rmp20EsLIYGdPkERegTgU19hQWCRhsRFGKHTliUlsry53tv17K7n077Kqa0WJU4ng==
 
 capacitor-native-biometric@^4.1.3:
   version "4.2.2"
@@ -2920,9 +2920,9 @@ ejs@^3.1.6:
     jake "^10.8.5"
 
 electron-to-chromium@^1.4.535:
-  version "1.4.581"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.581.tgz#23b684c67bf56d4284e95598c05a5d266653b6d8"
-  integrity sha512-6uhqWBIapTJUxgPTCHH9sqdbxIMPt7oXl0VcAL1kOtlU6aECdcMncCrX5Z7sHQ/invtrC9jUQUef7+HhO8vVFw==
+  version "1.4.582"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.582.tgz#4908215182266793499ac57d80e2680d7dd9b3db"
+  integrity sha512-89o0MGoocwYbzqUUjc+VNpeOFSOK9nIdC5wY4N+PVUarUK0MtjyTjks75AZS2bW4Kl8MdewdFsWaH0jLy+JNoA==
 
 elementtree@^0.1.7:
   version "0.1.7"
@@ -5562,9 +5562,9 @@ stackback@0.0.2:
   integrity sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==
 
 std-env@^3.3.3:
-  version "3.4.3"
-  resolved "https://registry.yarnpkg.com/std-env/-/std-env-3.4.3.tgz#326f11db518db751c83fd58574f449b7c3060910"
-  integrity sha512-f9aPhy8fYBuMN+sNfakZV18U39PbalgjXG3lLB9WkaYTxijru61wb57V9wxxNthXM5Sd88ETBWi29qLAsHO52Q==
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/std-env/-/std-env-3.5.0.tgz#83010c9e29bd99bf6f605df87c19012d82d63b97"
+  integrity sha512-JGUEaALvL0Mf6JCfYnJOTcobY+Nc7sG/TemDRBqCA0wEr4DER7zDchaaixTlmOxAjG1uRJmX82EQcxwTQTkqVA==
 
 stream-buffers@2.2.x:
   version "2.2.0"

From 807070ad9e8857160ffd7370ab65ed421b422b34 Mon Sep 17 00:00:00 2001
From: Benny Daon <benny@tuzig.com>
Date: Tue, 14 Nov 2023 16:33:47 +0200
Subject: [PATCH 43/53] Moving the retry where it belongs

---
 ios/App/Podfile.lock | 18 +++++++++---------
 src/gate.ts          | 29 ++++++-----------------------
 src/shell.ts         | 12 +++++++++++-
 3 files changed, 26 insertions(+), 33 deletions(-)

diff --git a/ios/App/Podfile.lock b/ios/App/Podfile.lock
index 7d930bb3..6469c67c 100644
--- a/ios/App/Podfile.lock
+++ b/ios/App/Podfile.lock
@@ -28,12 +28,12 @@ PODS:
   - CapacitorStatusBar (5.0.6):
     - Capacitor
   - NMSSHT7 (2.9.1)
-  - PurchasesHybridCommon (7.0.0):
-    - RevenueCat (= 4.27.0)
-  - RevenueCat (4.27.0)
-  - RevenuecatPurchasesCapacitor (7.0.0):
+  - PurchasesHybridCommon (7.3.0):
+    - RevenueCat (= 4.30.2)
+  - RevenueCat (4.30.2)
+  - RevenuecatPurchasesCapacitor (7.1.0):
     - Capacitor
-    - PurchasesHybridCommon (= 7.0.0)
+    - PurchasesHybridCommon (= 7.3.0)
 
 DEPENDENCIES:
   - "Capacitor (from `../../node_modules/@capacitor/ios`)"
@@ -106,10 +106,10 @@ SPEC CHECKSUMS:
   CapacitorSshPlugin: 79f67cb26d40bd0c07cec6dda93d93d5faf7b614
   CapacitorStatusBar: 565c0a1ebd79bb40d797606a8992b4a105885309
   NMSSHT7: 67f9d8f43b40b997728761b4cf2aa7ea660ba7c2
-  PurchasesHybridCommon: af3b2413f9cb999bc1fdca44770bdaf39dfb89fa
-  RevenueCat: 84fbe2eb9bbf63e1abf346ccd3ff9ee45d633e3b
-  RevenuecatPurchasesCapacitor: c0de310959a58b3217acd7ec5ce981175bb050b1
+  PurchasesHybridCommon: a3101e0f94de9bf872a67a6511ecaa932fdef02e
+  RevenueCat: bedd1226d8081830838fb492603cc96349a24f34
+  RevenuecatPurchasesCapacitor: cf268ba90377d12f49e6b003244a0c0fa87b1a80
 
 PODFILE CHECKSUM: b1f79f7d62e59482e73924f44c49c50186ac72be
 
-COCOAPODS: 1.11.3
+COCOAPODS: 1.12.1
diff --git a/src/gate.ts b/src/gate.ts
index d3e0bff4..50c7af9e 100644
--- a/src/gate.ts
+++ b/src/gate.ts
@@ -181,6 +181,7 @@ export class Gate {
             this.marker = null
             this.notify(`🥂  over ${this.session.isSSH?"SSH":"WebRTC"}`)
             this.setIndicatorColor("unset")
+            this.map.shell.stopWatchdog()
             // first onConnected is special if it's a new gate but once
             // connected, we're back to loading the gate
             this.onConnected()
@@ -190,26 +191,10 @@ export class Gate {
             this.lastDisconnect = Date.now()
             // TODO: start the rain
             this.setIndicatorColor(FAILED_COLOR)
-            if (terminal7.recovering) {
-                const session = this.session as WebRTCSession
-                session.msgHandlers.forEach(v => v[1]("Disconnected"))
-                setTimeout(() => this.reconnect(), 10)
-                terminal7.recovering = false
-                return
-            }
-        } else if (state == "failed")  {
-            if (terminal7.recovering)  {
-                terminal7.recovering = false
-                terminal7.log("failure while recovering")
-                if (this.session?.isSSH) { // if ssh, try again
-                    setTimeout(() => this.completeConnect(), 100)
-                    return
-                }
-                this.session.close()
-                this.session = null
-                this.reconnect()
-            } else
+            if (terminal7.recovering)
                 this.handleFailure(failure)
+        } else if (state == "failed")  {
+            this.handleFailure(failure)
         }
     }
     // handle connection failures
@@ -266,11 +251,9 @@ export class Gate {
                     this.session.close()
                     this.session = null
                 }
-                if (terminal7.recovering)  {
-                    terminal7.log("Cleaned session as failure on recovering")
-                    return
+                if (!terminal7.recovering)  {
+                    this.notify(failure?"Lost Data Channel":"Lost Connection" + ", please try `reset`")
                 }
-                this.notify(failure?"Lost Data Channel":"Lost Connection" + ", please try `reset`")
                 break
 
             case Failure.KeyRejected:
diff --git a/src/shell.ts b/src/shell.ts
index 193b6e86..ef01a815 100644
--- a/src/shell.ts
+++ b/src/shell.ts
@@ -410,6 +410,12 @@ export class Shell {
      * onDisconnect is called when a gate disconnects.
      */
     async onDisconnect(gate: Gate, wasSSH?: boolean) {
+        const retry = async () => {
+            terminal7.recovering = false
+            terminal7.log("retrying...")
+            this.startWatchdog(terminal7.conf.net.timeout).catch(e => gate.handleFailure(e))
+            await gate.reconnect()
+        }
         console.log("onDisconnect", gate)
         this.stopWatchdog()
         if (wasSSH) {
@@ -432,7 +438,11 @@ export class Shell {
             this.printPrompt()
             return
         } 
-        if (!terminal7.netConnected || terminal7.recovering ||
+        if (terminal7.recovering) {
+            retry()
+            return
+        }
+        if (!terminal7.netConnected ||
             ((terminal7.activeG != null) && (gate != terminal7.activeG)))
             return
 

From 600db475726fe949d174fdf786a24ee8545e0e84 Mon Sep 17 00:00:00 2001
From: Benny Daon <benny@tuzig.com>
Date: Thu, 16 Nov 2023 11:04:30 +0200
Subject: [PATCH 44/53] Removing the first failing resize

---
 src/gate.ts        | 2 +-
 src/pane.ts        | 9 +++++----
 tests/gate.test.ts | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/gate.ts b/src/gate.ts
index 50c7af9e..36a55399 100644
--- a/src/gate.ts
+++ b/src/gate.ts
@@ -375,7 +375,7 @@ export class Gate {
     reset() {
         this.t7.map.shell.runCommand("reset", [this.name])
     }
-    setLayout(state: ServerPayload = null, fromPresenter = false) {
+    setLayout(state: ServerPayload | null = null, fromPresenter = false) {
         console.log("in setLayout", state)
         const winLen = this.windows.length
         if(this.fitScreen)
diff --git a/src/pane.ts b/src/pane.ts
index c0e27eb8..1aa4211f 100644
--- a/src/pane.ts
+++ b/src/pane.ts
@@ -72,7 +72,7 @@ export class Pane extends Cell {
     fontSize: number
     imageAddon: ImageAddon
     lastKey = ''
-    needsResize = false
+    needsResize: boolean
     searchAddon: SearchAddon
     searchDown = false
     searchTerm = ''
@@ -92,6 +92,7 @@ export class Pane extends Cell {
         this.theme = props.theme || this.t7.conf.theme
         this.resizeObserver = new window.ResizeObserver(() => this.fit())
         this.channelID = props.channelID
+        this.needsResize = false
     }
 
     /*
@@ -113,8 +114,8 @@ export class Pane extends Cell {
             fontFamily: "FiraCode",
             fontSize: this.fontSize * this.gate.fontScale,
             theme: this.theme,
-            rows:24,
-            cols:80,
+            rows:4,
+            cols:4,
             allowProposedApi: true,
             /* TODO: restore this. commented because it silences spotify
             bellStyle: "sound",
@@ -337,7 +338,7 @@ export class Pane extends Cell {
         if (this.t.rows != oldr || this.t.cols != oldc) {
             if (this.d && this.gate.fitScreen)
                 this.d.resize(this.t.cols, this.t.rows)
-            else
+            else if ((oldr != 4) && (oldc != 4))
                 this.needsResize = true
         }
         if (cb instanceof Function) cb(this)
diff --git a/tests/gate.test.ts b/tests/gate.test.ts
index 9f3eadb8..1d2db197 100644
--- a/tests/gate.test.ts
+++ b/tests/gate.test.ts
@@ -118,7 +118,7 @@ describe("gate", () => {
         expect(g.boarding).to.equal(true)
         expect(g.session.connect).toHaveBeenCalledTimes(1)
         expect(g.session.openChannel).toHaveBeenCalledTimes(1)
-        expect(g.session.openChannel.mock.calls[0]).toEqual(["bash", null, 80, 24])
+        expect(g.session.openChannel.mock.calls[0]).toEqual(["bash", null, 4, 4])
         let panes = g.panes()
         await sleep(100)
         expect(panes.length).to.equal(1)

From a66b0bec968ec2887ec3e51dfef61b76671988a8 Mon Sep 17 00:00:00 2001
From: Benny Daon <benny@tuzig.com>
Date: Thu, 16 Nov 2023 11:17:38 +0200
Subject: [PATCH 45/53] Adding PeerBook to ui tests

so it's more like the real env and tests stop failing
---
 aatp/ui/lab.yaml   | 36 ++++++++++++++++++++++++++++++++++++
 aatp/ui/ui.spec.ts |  2 ++
 2 files changed, 38 insertions(+)

diff --git a/aatp/ui/lab.yaml b/aatp/ui/lab.yaml
index 002e605b..7336fd8e 100644
--- a/aatp/ui/lab.yaml
+++ b/aatp/ui/lab.yaml
@@ -31,5 +31,41 @@ services:
     volumes:
       - ./aatp/ui/webexec_conf:/conf
       - webexec_auth:/auth
+  peerbook:
+    build:
+      context: .
+      dockerfile: ./aatp/infra/peerbook/Dockerfile
+      args:
+        REF: ${PEERBOOK_REF-master}
+    expose:
+      - 17777
+    depends_on:
+      - redis
+      - revenuecat
+    environment:
+      REDIS_HOST: redis:6379
+      REVENUECAT_URL: http://revenuecat:1080
+      PB_SMTP_HOST: smtp
+      PB_SMTP_PORT: 1025
+      PB_HOME_URL: http://peerbook:17777
+      WEBEXEC_SERVER_URL: http://peerbook:17777
+  redis:
+    build:
+      context: .
+      dockerfile: ./aatp/infra/redis/Dockerfile
+  revenuecat:
+    image: "mockserver/mockserver"
+    environment:
+      MOCKSERVER_INITIALIZATION_JSON_PATH: /config/revenuecat_double.json
+      MOCKSERVER_LOG_LEVEL: WARN
+    expose:
+      - 1080
+    volumes:
+      - ./aatp/peerbook_webrtc:/config
+  smtp:
+    image: jcalonso/mailhog
+    expose:
+      - 1025
+      - 8025
 volumes:
   webexec_auth:
diff --git a/aatp/ui/ui.spec.ts b/aatp/ui/ui.spec.ts
index 04b8b95d..7715c354 100644
--- a/aatp/ui/ui.spec.ts
+++ b/aatp/ui/ui.spec.ts
@@ -39,6 +39,8 @@ test.describe('terminal7 UI', ()  => {
         await page.evaluate(async () => {
             window.terminal7.notify = (msg: string) => console.log("NOTIFY: "+msg)
             localStorage.setItem("CapacitorStorage.dotfile",`
+[net]
+peerbook = "peerbook:17777"
 [peerbook]
 insecure=true`)
             localStorage.setItem("CapacitorStorage.gates", JSON.stringify(

From 3535ade00856273972d2b52d88a70fc7cfe47a9d Mon Sep 17 00:00:00 2001
From: Benny Daon <benny@tuzig.com>
Date: Thu, 16 Nov 2023 11:27:46 +0200
Subject: [PATCH 46/53] Improving notification

---
 src/gate.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gate.ts b/src/gate.ts
index 36a55399..2dc44a49 100644
--- a/src/gate.ts
+++ b/src/gate.ts
@@ -252,7 +252,7 @@ export class Gate {
                     this.session = null
                 }
                 if (!terminal7.recovering)  {
-                    this.notify(failure?"Lost Data Channel":"Lost Connection" + ", please try `reset`")
+                    this.notify(failure?"Lost Data Channel":"Lost Connection")
                 }
                 break
 

From da1d477f9c1e3c9b412514a3c641660d8e9e5da2 Mon Sep 17 00:00:00 2001
From: Benny Daon <benny@tuzig.com>
Date: Thu, 16 Nov 2023 16:06:55 +0200
Subject: [PATCH 47/53] Polishing

---
 src/gate.ts      |  7 +-----
 src/peerbook.ts  | 64 ++++++++++++++++++++----------------------------
 src/shell.ts     | 15 +++++++++---
 src/terminal7.ts | 58 ++++++++++++++++++++-----------------------
 4 files changed, 66 insertions(+), 78 deletions(-)

diff --git a/src/gate.ts b/src/gate.ts
index 2dc44a49..f6ac7e7a 100644
--- a/src/gate.ts
+++ b/src/gate.ts
@@ -674,12 +674,7 @@ export class Gate {
         if (overPB) {
             this.notify("🎌  PeerBook")
             if (!terminal7.pb.isOpen()) {
-                try {
-                    await terminal7.pbConnect()
-                } catch(e) {
-                    this.notify(`${PB} Connection failed: ${e}`)
-                    return
-                }
+                await terminal7.pbConnect()
             }
             this.session = new PeerbookSession(this.fp)
         } else {
diff --git a/src/peerbook.ts b/src/peerbook.ts
index 0c2ad261..62c8947e 100644
--- a/src/peerbook.ts
+++ b/src/peerbook.ts
@@ -45,7 +45,6 @@ interface ConnectParams {
     count?: number  // internal use for retrying
 }
 export class PeerbookConnection {
-    ws: WebSocket = null
     host: string
     insecure = false
     fp: string
@@ -69,17 +68,11 @@ export class PeerbookConnection {
 
     async adminCommand(cmd: unknown): Promise<string> {
         return new Promise((resolve, reject) => {
-            if (!this.session) {
-                console.log("Admin command with no session", cmd)
-                this.connect({firstMsg: cmd}).then(() => {
-                    console.log("Connected, resolving")
-                    resolve("")
-                }).catch(e => {
-                    console.log("Failed to connect")
-                    reject(e)
-                })
-            } else
-                this.session.sendCTRLMsg(cmd, resolve, reject)
+            const complete = () => this.session.sendCTRLMsg(cmd, resolve, reject)
+            if (!this.session)
+                terminal7.pbConnect().then(complete).catch(reject)
+            else
+                complete()
         })
     }
 
@@ -224,21 +217,22 @@ export class PeerbookConnection {
                 resolve(this.uid)
                 return
             }
-            if (!this.session) {
-                console.log("get UID with No session")
-                reject("No session")
-                return
-            }
-            this.session.sendCTRLMsg({type: "ping"}, (uid: string) => {
+            this.adminCommand({type: "ping"}).then((uid: string) => {
                 this.uid = uid
                 resolve(uid)
-            }, reject)
+            }).catch(reject)
         })
     }
 
     async connect(params?: ConnectParams) {
         return new Promise<void>((resolve, reject) =>{
             if (this.session) {
+                const state = this.session.pc.connectionState
+                // check is connection in progress 
+                if ((state == "new") || (state == "connecting")) {
+                    resolve()
+                    return
+                }
                 if (this.uid == "TBD") {
                     reject("Unregistered")
                     return
@@ -250,6 +244,7 @@ export class PeerbookConnection {
                 this.session.close()
                 this.session = null
             }
+            this.startSpinner()
             const schema = terminal7.conf.peerbook.insecure? "http" : "https"
             const url = `${schema}://${terminal7.conf.net.peerbook}/offer`
             if (params?.token)
@@ -267,14 +262,14 @@ export class PeerbookConnection {
                             terminal7.log("Got TBD as uid")
                             reject("Unregistered")
                         } else {
-                            Purchases.logIn({ appUserID: uid })
+                            terminal7.run(() => Purchases.logIn({ appUserID: uid }), 10)
                             resolve()
                         }
                     }).catch(e => {
                         this.session = null
                         terminal7.log("Failed to get user id", e.toString())
                         resolve()
-                    })
+                    }).finally(() => this.stopSpinner())
                     return
                 }
                 else if (state == 'disconnected' || state == 'failed' || state == 'closed') {
@@ -283,21 +278,24 @@ export class PeerbookConnection {
                     if (this.session)
                         this.session.close()
                     this.session = null
-                    console.log("PB webrtc connection failed", failure, this.uid)
+                    this.stopSpinner()
+                    terminal7.log("PB webrtc connection failed", failure, this.uid)
                     if (failure == Failure.Unauthorized) {
                         reject(failure)
                     } else {
-                        if (!params)
-                            params = {}
-                        if (!params.count)
-                            params.count = 0
-                        else if  (params?.count > 2) {
+                        let np = {}
+                        if (params)
+                            // make a copy of params
+                            np = {...params}
+                        if (!np.count)
+                            np.count = 0
+                        else if (np?.count > 2) {
                             reject(failure)
                             return
                         }
                         setTimeout(() => {
-                            params.count++
-                            this.connect(params).then(resolve).catch(reject)
+                            np.count++
+                            this.connect(np).then(resolve).catch(reject)
                         }, 100)
                     }
                     return
@@ -314,14 +312,6 @@ export class PeerbookConnection {
         terminal7.notify(PB + " " + msg)
     }
     close() {
-        if (this.ws) {
-            this.ws.onopen = undefined
-            this.ws.onmessage = undefined
-            this.ws.onerror = undefined
-            this.ws.onclose = undefined
-            this.ws.close()
-            this.ws = null
-        }
         if (this.session) {
             this.session.onStateChange = undefined
             this.session.close()
diff --git a/src/shell.ts b/src/shell.ts
index ef01a815..fc4910b8 100644
--- a/src/shell.ts
+++ b/src/shell.ts
@@ -413,10 +413,19 @@ export class Shell {
         const retry = async () => {
             terminal7.recovering = false
             terminal7.log("retrying...")
-            this.startWatchdog(terminal7.conf.net.timeout).catch(e => gate.handleFailure(e))
-            await gate.reconnect()
+            this.startWatchdog(terminal7.conf.net.timeout).catch(e => gate.handleFailure(Failure.TimedOut))
+            try {
+                await gate.reconnect()
+            } catch (e) {
+                terminal7.log("reconnect failed", e)
+                if (e == Failure.Unauthorized) {
+                    terminal7.pb.notify("Unauthorized, please `subscribe`")
+                    return
+                } else
+                    gate.notify("Reconnect failed")
+            }
         }
-        console.log("onDisconnect", gate)
+        terminal7.log("onDisconnect", gate.name)
         this.stopWatchdog()
         if (wasSSH) {
             this.escapeActiveForm()
diff --git a/src/terminal7.ts b/src/terminal7.ts
index c041de09..87371f00 100644
--- a/src/terminal7.ts
+++ b/src/terminal7.ts
@@ -359,7 +359,7 @@ export class Terminal7 {
                     RateApp.requestReview()
            }, 100)
         })
-        this.pbConnect().finally(() =>
+        this.pbConnect().catch(e => this.log(e)).finally(() =>
             Network.getStatus().then(s => {
                 this.updateNetworkStatus(s)
                 if (!s.connected) {
@@ -413,30 +413,28 @@ export class Terminal7 {
         const statusE = document.getElementById("peerbook-status") as HTMLSpanElement
         return new Promise((resolve, reject) => {
             function callResolve() {
-                if (terminal7.pb)
-                    terminal7.pb.stopSpinner()
                 statusE.style.opacity = "1"
                 resolve()
             }
             function callReject(e, symbol = "") {
-                if (terminal7.pb)
-                    terminal7.pb.stopSpinner()
                 statusE.style.opacity = "1"
                 statusE.innerHTML = symbol
                 console.log("pbConnect failed", e)
                 reject(e)
             }
-            const catchConnect = e => {
-                let symbol = "⛔︎"
+            function catchConnect(e) {
+                let symbol = LOCK_HTML_SYMBOL
                 if (e =="Unregistered")
                     this.notify(Capacitor.isNativePlatform()?
                         `${PB} You need to register, please \`subscribe\``:
                         `${PB} You need to regisrer, please \`subscribe\` on your tablet`)
                     
-                else if (e == Failure.NotSupported)
+                else if (e == Failure.NotSupported) {
                     // TODO: this should be changed to a notification
                     // after we upgrade peerbook
+                    symbol = "⛔︎"
                     console.log("PB not supported")
+                }
                 else if (e != "Unauthorized") {
                     terminal7.log("PB connect failed", e)
                     this.notify(Capacitor.isNativePlatform()?
@@ -445,40 +443,36 @@ export class Terminal7 {
                     this.notify("If the problem persists, `support`")
                     symbol = ERROR_HTML_SYMBOL
                 } else
-                    symbol = LOCK_HTML_SYMBOL
 
                 callReject(e, symbol)
             }
 
-            // do nothing when no subscription or already connected
+            const complete = () => this.pb.connect()
+                .then(callResolve)
+                .catch(catchConnect)
             if (this.pb) {
-                this.pb.startSpinner()
-                if ((this.pb.uid != "TBD")  && (this.pb.uid != "")) {
-                    callResolve()
-                    return
-                }
                 if (this.pb.isOpen())
                     callResolve()
                 else
-                    this.pb.connect().then(callResolve).catch(catchConnect)
+                    complete()
                 return
-            }
-            this.getFingerprint().then(fp => {
-                this.pb = new PeerbookConnection({
-                    fp: fp,
-                    host: this.conf.net.peerbook,
-                    insecure: this.conf.peerbook && this.conf.peerbook.insecure,
-                    shell: this.map.shell
+            } else {
+                this.getFingerprint().then(fp => {
+                    this.pb = new PeerbookConnection({
+                        fp: fp,
+                        host: this.conf.net.peerbook,
+                        insecure: this.conf.peerbook && this.conf.peerbook.insecure,
+                        shell: this.map.shell
+                    })
+                    if (!this.purchasesStarted) {
+                        this.pb.startPurchases()
+                            .then(complete) 
+                            .catch(callReject)
+                            .finally(() => this.purchasesStarted = true)
+                    } else
+                        complete()
                 })
-                this.pb.startSpinner()
-                if (!this.purchasesStarted) {
-                    this.pb.startPurchases().then(() => 
-                        this.pb.connect().then(callResolve).catch(catchConnect)
-                        // this.pb.updateCustomerInfo().then(callResolve).catch(callReject)
-                    ).catch(callReject).finally(() => this.purchasesStarted = true)
-                } else
-                    this.pb.connect().then(callResolve).catch(catchConnect)
-            })
+            }
         })
     }
     catchFingers() {

From 67ee7e8c1a69204680d61eda44a5e600e74aece7 Mon Sep 17 00:00:00 2001
From: Benny Daon <benny@tuzig.com>
Date: Fri, 17 Nov 2023 10:20:53 +0200
Subject: [PATCH 48/53] Improving flaky tests

---
 aatp/ui/ui.spec.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/aatp/ui/ui.spec.ts b/aatp/ui/ui.spec.ts
index 7715c354..a5062ca0 100644
--- a/aatp/ui/ui.spec.ts
+++ b/aatp/ui/ui.spec.ts
@@ -93,6 +93,7 @@ insecure=true`)
         await sleep(500)
         await page.locator('.tabbar .reset').click()
         await expect(page.locator('#t0')).toBeVisible()
+        await sleep(100)
         await page.keyboard.press('ArrowDown')
         await page.keyboard.press('Enter')
         await expect(page.locator('.windows-container')).toBeHidden()
@@ -111,7 +112,7 @@ insecure=true`)
         await page.screenshot({ path: `/result/2.png` })
         await page.locator('.tabbar .reset').click()
         await expect(page.locator('#t0')).toBeVisible()
-        await sleep(20)
+        await sleep(100)
         await page.keyboard.press('Enter')
         await expect(page.locator('#t0')).toBeHidden()
         await expect(page.locator('.pane')).toHaveCount(1)

From 4aaf60ca279b2bd20894c9ceb3db188a99e7e372 Mon Sep 17 00:00:00 2001
From: Benny Daon <benny@tuzig.com>
Date: Fri, 17 Nov 2023 10:21:23 +0200
Subject: [PATCH 49/53] Linting

---
 src/peerbook.ts | 2 +-
 src/shell.ts    | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/peerbook.ts b/src/peerbook.ts
index 62c8947e..791a3490 100644
--- a/src/peerbook.ts
+++ b/src/peerbook.ts
@@ -283,7 +283,7 @@ export class PeerbookConnection {
                     if (failure == Failure.Unauthorized) {
                         reject(failure)
                     } else {
-                        let np = {}
+                        let np: ConnectParams
                         if (params)
                             // make a copy of params
                             np = {...params}
diff --git a/src/shell.ts b/src/shell.ts
index fc4910b8..c51a474c 100644
--- a/src/shell.ts
+++ b/src/shell.ts
@@ -413,7 +413,7 @@ export class Shell {
         const retry = async () => {
             terminal7.recovering = false
             terminal7.log("retrying...")
-            this.startWatchdog(terminal7.conf.net.timeout).catch(e => gate.handleFailure(Failure.TimedOut))
+            this.startWatchdog(terminal7.conf.net.timeout).catch(e => gate.handleFailure(e))
             try {
                 await gate.reconnect()
             } catch (e) {
@@ -423,7 +423,10 @@ export class Shell {
                     return
                 } else
                     gate.notify("Reconnect failed")
+            } finally {
+                this.stopWatchdog()
             }
+
         }
         terminal7.log("onDisconnect", gate.name)
         this.stopWatchdog()

From b930d8f83666ab09df1f49232cfe59ce16071555 Mon Sep 17 00:00:00 2001
From: Benny Daon <benny@tuzig.com>
Date: Fri, 17 Nov 2023 11:30:34 +0200
Subject: [PATCH 50/53] Polishing

---
 src/commands.ts       |  5 +++--
 src/peerbook.ts       |  9 ++++++++-
 src/shell.ts          | 36 ++++++++++++++++--------------------
 src/terminal7.ts      | 26 +++++++++++---------------
 src/webrtc_session.ts | 42 ++++++------------------------------------
 5 files changed, 44 insertions(+), 74 deletions(-)

diff --git a/src/commands.ts b/src/commands.ts
index 6347dc57..de62609f 100644
--- a/src/commands.ts
+++ b/src/commands.ts
@@ -666,12 +666,13 @@ async function subscribeCMD(shell: Shell) {
                 await terminal7.pb.purchase(p.p)
             } catch(e) {
                 console.log("purchase error", e)
+                shell.stopWatchdog()
                 shell.t.writeln("Error purchasing, please try again or `support`")
                 return
             } finally {
                 terminal7.ignoreAppEvents = false
-                shell.stopWatchdog()
             }
+            shell.stopWatchdog()
 
         }
     }
@@ -988,7 +989,7 @@ async function loginCMD(shell: Shell) {
     while (!terminal7.pb.uid && !timedOut) {
         await new Promise(r => setTimeout(r, 2000))
         try {
-            await terminal7.pb.connect()
+            await terminal7.pbConnect()
         } catch(e) {
             terminal7.log("Failed to connect to PeerBook", e)
         }
diff --git a/src/peerbook.ts b/src/peerbook.ts
index 791a3490..8e90ea60 100644
--- a/src/peerbook.ts
+++ b/src/peerbook.ts
@@ -57,6 +57,7 @@ export class PeerbookConnection {
     updatingStore = false
     spinnerInterval = null
     headers: Map<string,string>
+    purchasesStarted = false
 
     constructor(props:PeerbookProps) {
         // copy all props to this
@@ -150,7 +151,12 @@ export class PeerbookConnection {
         this.shell.printPrompt()
     }
     async startPurchases() {
+        /*
+        if (this.purchasesStarted)
+            return
+            */
         console.log("Starting purchases")
+        
         await Purchases.setMockWebResults({ shouldMockWebResults: true })
         const keys = {
             ios: 'appl_qKHwbgKuoVXokCTMuLRwvukoqkd',
@@ -166,6 +172,7 @@ export class PeerbookConnection {
             terminal7.log("Failed to setup purchases", e)
             return
         }
+        this.purchasesStarted = true
     }
 
     /*
@@ -283,7 +290,7 @@ export class PeerbookConnection {
                     if (failure == Failure.Unauthorized) {
                         reject(failure)
                     } else {
-                        let np: ConnectParams
+                        let np: ConnectParams = {}
                         if (params)
                             // make a copy of params
                             np = {...params}
diff --git a/src/shell.ts b/src/shell.ts
index c51a474c..fe4690fd 100644
--- a/src/shell.ts
+++ b/src/shell.ts
@@ -410,24 +410,6 @@ export class Shell {
      * onDisconnect is called when a gate disconnects.
      */
     async onDisconnect(gate: Gate, wasSSH?: boolean) {
-        const retry = async () => {
-            terminal7.recovering = false
-            terminal7.log("retrying...")
-            this.startWatchdog(terminal7.conf.net.timeout).catch(e => gate.handleFailure(e))
-            try {
-                await gate.reconnect()
-            } catch (e) {
-                terminal7.log("reconnect failed", e)
-                if (e == Failure.Unauthorized) {
-                    terminal7.pb.notify("Unauthorized, please `subscribe`")
-                    return
-                } else
-                    gate.notify("Reconnect failed")
-            } finally {
-                this.stopWatchdog()
-            }
-
-        }
         terminal7.log("onDisconnect", gate.name)
         this.stopWatchdog()
         if (wasSSH) {
@@ -451,8 +433,22 @@ export class Shell {
             return
         } 
         if (terminal7.recovering) {
-            retry()
-            return
+            terminal7.log("retrying...")
+            terminal7.recovering = false
+            this.startWatchdog(terminal7.conf.net.timeout).catch(e => gate.handleFailure(e))
+            try {
+                await gate.reconnect()
+            } catch (e) {
+                terminal7.log("reconnect failed", e)
+                if (e == Failure.Unauthorized) {
+                    terminal7.pb.notify("Unauthorized, please `subscribe`")
+                    return
+                } else
+                    gate.notify("Reconnect failed")
+            } finally {
+                this.stopWatchdog()
+            }
+
         }
         if (!terminal7.netConnected ||
             ((terminal7.activeG != null) && (gate != terminal7.activeG)))
diff --git a/src/terminal7.ts b/src/terminal7.ts
index 87371f00..da955015 100644
--- a/src/terminal7.ts
+++ b/src/terminal7.ts
@@ -142,7 +142,6 @@ export class Terminal7 {
     pendingPanes
     pb?: PeerbookConnection = null
     ignoreAppEvents = false
-    purchasesStarted = false
     iceServers?: IceServers[]
     recovering?: boolean
     metaPressStart: number
@@ -213,12 +212,12 @@ export class Terminal7 {
         this.lastActiveState = active
         this.log("app state changed", this.ignoreAppEvents)
         if (this.ignoreAppEvents) {
-            terminal7.log("ignoring benched app event")
+            terminal7.log("ignoring app event", active)
             return
         }
-        if (!active) {
+        if (!active)
             this.updateNetworkStatus({connected: false}, false)
-        } else {
+        else {
             // We're back! puts us in recovery mode so that it'll
             // quietly reconnect to the active gate on failure
             this.clearTimeouts()
@@ -359,14 +358,15 @@ export class Terminal7 {
                     RateApp.requestReview()
            }, 100)
         })
-        this.pbConnect().catch(e => this.log(e)).finally(() =>
+        this.pbConnect()
+            .catch(e => this.log("pbConnect failed", e))
+            .finally(() =>
             Network.getStatus().then(s => {
                 this.updateNetworkStatus(s)
                 if (!s.connected) {
                     this.goHome()
                 }
-            })
-        )
+            }))
         const resizeObserver = new ResizeObserver(() => {
             if (this.activeG)
                 this.activeG.setFitScreen()
@@ -432,7 +432,7 @@ export class Terminal7 {
                 else if (e == Failure.NotSupported) {
                     // TODO: this should be changed to a notification
                     // after we upgrade peerbook
-                    symbol = "⛔︎"
+                    symbol = "🚱"
                     console.log("PB not supported")
                 }
                 else if (e != "Unauthorized") {
@@ -464,13 +464,9 @@ export class Terminal7 {
                         insecure: this.conf.peerbook && this.conf.peerbook.insecure,
                         shell: this.map.shell
                     })
-                    if (!this.purchasesStarted) {
-                        this.pb.startPurchases()
-                            .then(complete) 
-                            .catch(callReject)
-                            .finally(() => this.purchasesStarted = true)
-                    } else
-                        complete()
+                    this.pb.startPurchases()
+                        .then(complete) 
+                        .catch(callReject)
                 })
             }
         })
diff --git a/src/webrtc_session.ts b/src/webrtc_session.ts
index 9238b973..8f36b9c5 100644
--- a/src/webrtc_session.ts
+++ b/src/webrtc_session.ts
@@ -431,7 +431,6 @@ export class PeerbookSession extends WebRTCSession {
                                         }})
             } catch(e) {
                 terminal7.log("failed to send candidate", e)
-                terminal7.notify("Failed to connect, please try again")
             }
         } else {
             terminal7.log("ignoring ice candidate", JSON.stringify(ev.candidate))
@@ -482,18 +481,15 @@ export class PeerbookSession extends WebRTCSession {
 // SSHSession is an implmentation of a real time session over ssh
 export class HTTPWebRTCSession extends WebRTCSession {
     address: string
-    headers: HttpHeaders
-    sessionURL: string | null
+    headers: HttpHeaders = {}
+    sessionURL: string | null = null
     pendingCandidates: Array<RTCIceCandidate>
     // storing the setTimeout id so we can cancel it
-    retryDelete: number | null = null
     constructor(address: string, headers?: Map<string, string>) {
         super()
         this.address = address
-        this.headers = {}
         if (headers)
             headers.forEach((v, k) => this.headers[k] =  v)
-        this.sessionURL = null
         console.log("new http webrtc session", address, JSON.stringify(this.headers))
     }
 
@@ -520,7 +516,7 @@ export class HTTPWebRTCSession extends WebRTCSession {
             } else if (response.status == 201) {
                 this.sessionURL = response.headers['location'] || response.headers['Location']
                 console.log("got a session url", this.sessionURL)
-                console.log("waiting candidates", this.pendingCandidates.length)
+                console.log("--> penfing candidates", this.pendingCandidates)
                 this.pendingCandidates.forEach(c => this.sendCandidate(c))
                 this.pendingCandidates = []
                 return response.data
@@ -587,38 +583,12 @@ export class HTTPWebRTCSession extends WebRTCSession {
     }
     onIceCandidate(ev: RTCPeerConnectionIceEvent) {
         console.log("got ice candidate", ev)
-        if (ev.candidate == null) {
-            /*TODO: DELETE the session
-            if ((this.sessionURL != null) && (this.pendingCandidates.length == 0)) {
-                CapacitorHttp.delete({
-                    url: this.sessionURL,
-                    readTimeout: 3000,
-                    connectTimeout: 3000,
-                })
-                this.sessionURL = null
-                // cancel the retry
-                if (this.retryDelete) {
-                    clearTimeout(this.retryDelete)
-                    this.retryDelete = null
-                }
-            }
-            else
-                this.retryDelete = setTimeout(() => this.onIceCandidate(new RTCPeerConnectionIceEvent("candidate", {candidate: null})), 1000)
-                */
-            return
+        if (ev.candidate != null) {
+            this.sendCandidate(ev.candidate)
         }
-        this.sendCandidate(ev.candidate)
     }
     close(): void {
-        clearTimeout(this.retryDelete)
         super.close()
-        if (this.sessionURL != null) {
-            CapacitorHttp.delete({
-                url: this.sessionURL,
-                readTimeout: 3000,
-                connectTimeout: 3000,
-            })
-            this.sessionURL = null
-        }
+        this.sessionURL = null
     }
 }

From a5b3dab9af6eb36d763aa1382e5ac9ebe4ee531a Mon Sep 17 00:00:00 2001
From: Benny Daon <benny@tuzig.com>
Date: Sun, 19 Nov 2023 10:59:40 +0200
Subject: [PATCH 51/53] Adding a sleep to a test for resiliency

---
 aatp/ui/ui.spec.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/aatp/ui/ui.spec.ts b/aatp/ui/ui.spec.ts
index a5062ca0..8f4a95c6 100644
--- a/aatp/ui/ui.spec.ts
+++ b/aatp/ui/ui.spec.ts
@@ -114,6 +114,7 @@ insecure=true`)
         await expect(page.locator('#t0')).toBeVisible()
         await sleep(100)
         await page.keyboard.press('Enter')
+        await sleep(100)
         await expect(page.locator('#t0')).toBeHidden()
         await expect(page.locator('.pane')).toHaveCount(1)
         await expect(page.locator('.windows-container')).toBeVisible()

From e03176479e3989edf64165fe4da0de30aa020276 Mon Sep 17 00:00:00 2001
From: Benny Daon <benny@tuzig.com>
Date: Sun, 19 Nov 2023 13:11:09 +0200
Subject: [PATCH 52/53] Removing comments

---
 src/peerbook.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/peerbook.ts b/src/peerbook.ts
index 8e90ea60..fd07501b 100644
--- a/src/peerbook.ts
+++ b/src/peerbook.ts
@@ -151,10 +151,8 @@ export class PeerbookConnection {
         this.shell.printPrompt()
     }
     async startPurchases() {
-        /*
         if (this.purchasesStarted)
             return
-            */
         console.log("Starting purchases")
         
         await Purchases.setMockWebResults({ shouldMockWebResults: true })

From 640a26d99447e4c83862197cfdcba3c346752b97 Mon Sep 17 00:00:00 2001
From: Benny Daon <benny@tuzig.com>
Date: Sun, 19 Nov 2023 13:13:11 +0200
Subject: [PATCH 53/53] Avoiding reentrancy

---
 src/peerbook.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/peerbook.ts b/src/peerbook.ts
index fd07501b..9f204e32 100644
--- a/src/peerbook.ts
+++ b/src/peerbook.ts
@@ -153,6 +153,7 @@ export class PeerbookConnection {
     async startPurchases() {
         if (this.purchasesStarted)
             return
+        this.purchasesStarted = true
         console.log("Starting purchases")
         
         await Purchases.setMockWebResults({ shouldMockWebResults: true })
@@ -168,9 +169,9 @@ export class PeerbookConnection {
             await Purchases.configure(props)
         } catch (e) {
             terminal7.log("Failed to setup purchases", e)
+            this.purchasesStarted = false
             return
         }
-        this.purchasesStarted = true
     }
 
     /*