From 22ff8a7880e916670df8bb90d62ce5b6822acdfa Mon Sep 17 00:00:00 2001
From: Sosthene <contact@sosthene.net>
Date: Sat, 12 Oct 2024 15:09:34 +0200
Subject: [PATCH] Minor improvements

---
 src/services/service.ts | 33 +++++++++++++++------------------
 src/websockets.ts       |  6 +++---
 2 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/src/services/service.ts b/src/services/service.ts
index b9a2ee6..1702697 100644
--- a/src/services/service.ts
+++ b/src/services/service.ts
@@ -140,20 +140,16 @@ export default class Services {
     }
 
     public async sendPairingTx(spAddress: string): Promise<void> {
-      const services = await Services.getInstance();
+      // const services = await Services.getInstance();
       const amount = await this.getAmount() as any
       console.log("🚀 ~ Services ~ sendPairingTx ~ amount:", amount)
-      if(amount === 0n) {
-        const faucetMessage = await services.createFaucetMessage()
-        console.log("🚀 ~ WebSocketClient ~ this.ws.onopen= ~ faucetMessage:", faucetMessage)
-        services.websocketConnection?.sendNormalMessage(faucetMessage)
-      }
       
       const localAddress = await this.getDeviceAddress() as any
       const emptyTxid = '0'.repeat(64)
       
       try {
-        await services.sdkClient.pair_device(`${emptyTxid}:${U32_MAX}`, [spAddress])
+        let commitmentOutpoint = `${emptyTxid}:${U32_MAX}`;
+        await this.sdkClient.pair_device(commitmentOutpoint, [spAddress])
       } catch (e) {
         console.error("Services ~ Error:", e);
         return
@@ -171,14 +167,17 @@ export default class Services {
 
     async sendNewTxMessage(message: string) {
       const services = await Services.getInstance();
-      console.log("🚀 ~ WebSocketClient ~ this.ws.onopen= ~ newTxMessage:", message)
-      services.websocketConnection?.sendMessage('NewTx', message)
+      if (!services.websocketConnection) {
+        throw new Error('No websocket connection');
+      }
+      // console.log("🚀 ~ WebSocketClient ~ this.ws.onopen= ~ newTxMessage:", message)
+      await services.websocketConnection.sendMessage('NewTx', message)
     }
 
     async sendCommitMessage(message: string) {
       const services = await Services.getInstance();
-      console.log("🚀 ~ WebSocketClient ~ this.ws.onopen= ~ CommitMessage:", message)
-      services.websocketConnection?.sendMessage('Commit', message)
+      // console.log("🚀 ~ WebSocketClient ~ this.ws.onopen= ~ CommitMessage:", message)
+      await services.websocketConnection?.sendMessage('Commit', message)
     }
 
     async sendCipherMessages(ciphers: string[]) {
@@ -189,11 +188,10 @@ export default class Services {
       }
     }
 
-    async sendFaucetMessage(): Promise<void> {
+    async sendFaucetMessage(message: string): Promise<void> {
       const services = await Services.getInstance();
-      const faucetMessage = await services.createFaucetMessage()
-      console.log("🚀 ~ WebSocketClient ~ this.ws.onopen= ~ faucetMessage:", faucetMessage)
-      services.websocketConnection?.sendNormalMessage(faucetMessage)
+      // console.log("🚀 ~ WebSocketClient ~ this.ws.onopen= ~ faucetMessage:", message)
+      await services.websocketConnection?.sendMessage('Faucet', message);
     }
 
     async parseCipher(message: string) {
@@ -237,7 +235,6 @@ export default class Services {
     }
 
     private async handleApiReturn(apiReturn: ApiReturn) {
-      // const service = await Services.getInstance()
       if(apiReturn.ciphers_to_send && apiReturn.ciphers_to_send.length) {
         await this.sendCipherMessages(apiReturn.ciphers_to_send)
       }
@@ -347,12 +344,12 @@ export default class Services {
     async dumpDevice() {
       const services = await Services.getInstance();
       const device = await services.sdkClient.dump_device()
-      console.log("🚀 ~ Services ~ dumpDevice ~ device:", device)
+      // console.log("🚀 ~ Services ~ dumpDevice ~ device:", device)
       return device
     }
 
     async saveDevice(device: any): Promise<any> {
-      console.log("🚀 ~ Services ~ saveDevice ~ device:", device)
+      // console.log("🚀 ~ Services ~ saveDevice ~ device:", device)
       localStorage.setItem('wallet', device);
     }
 
diff --git a/src/websockets.ts b/src/websockets.ts
index 49e8011..884741c 100644
--- a/src/websockets.ts
+++ b/src/websockets.ts
@@ -19,8 +19,8 @@ class WebSocketClient {
                 const amount = await service.getAmount() as bigint
 
                 if(amount === 0n) {
-                const faucetMessage = await services.createFaucetMessage()
-                this.sendNormalMessage(faucetMessage)
+                    const faucetMessage = await services.createFaucetMessage()
+                    this.sendNormalMessage(faucetMessage)
                 }
 
                 while (this.messageQueue.length > 0) {
@@ -118,7 +118,7 @@ class WebSocketClient {
             console.log("Sending message:", JSON.stringify(networkMessage));
             this.ws.send(JSON.stringify(networkMessage));
         } else {
-            console.warn('WebSocket is not open. ReadyState:', this.ws.readyState);
+            console.error('WebSocket is not open. ReadyState:', this.ws.readyState);
             this.messageQueue.push(message);
         }
     }