polish

VedalAI · Jun 12, 2024 · c11089d · c11089d
1 parent 0d9c7c8
commit c11089d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/ebs/src/modules/game/connection.ts b/ebs/src/modules/game/connection.ts
@@ -41,7 +41,8 @@ export class GameConnection {
                 console.error("Could not parse message" + msgText);
                 return;
             }
-            console.log(`Got message ${JSON.stringify(msg)}`);
+            if (msg.messageType !== MessageType.Ping)
+                console.log(`Got message ${JSON.stringify(msg)}`);
             this.processMessage(msg);
         });
         ws.on("close", (code, reason) => {
@@ -102,7 +103,7 @@ export class GameConnection {
             if (err)
                 console.error(err);
         });
-        if (msg.messageType !== MessageType.Ping)
+        if (msg.messageType !== MessageType.Pong)
             console.debug(`Sent message ${JSON.stringify(msg)}`);
     }
     public makeMessage(type: MessageType, guid?: string): Message {
@@ -118,6 +119,7 @@ export class GameConnection {
             new Promise<ResultMessage>((resolve, reject) => {
                 if (!transactionId) {
                     reject(`Tried to redeem without transaction ID`);
+                    return;
                 }
 
                 const msg: RedeemMessage = {
@@ -132,11 +134,13 @@ export class GameConnection {
                 } as RedeemMessage;
                 if (this.outstandingRedeems.has(msg.guid)) {
                     reject(`Redeeming ${msg.guid} more than once`);
+                    return;
                 }
                 this.outstandingRedeems.set(msg.guid, msg);
 
                 if (!this.isConnected()) {
                     reject(`Redeemed without active connection`);
+                    return;
                 }
                 this.resultHandlers.set(msg.guid, resolve);
 

diff --git a/ebs/src/modules/transactions.ts b/ebs/src/modules/transactions.ts
@@ -284,7 +284,7 @@ app.post("/public/transaction", async (req, res) => {
                 }
             ]
         }).then();
-        res.status(500).send(`Failed to redeem - ${error}`);
+        res.status(500).send(`Failed to process redeem - ${error}`);
     }
 });
-Original file line number
+Diff line change
@@ Expand Up / @@ -284,7 +284,7 @@ app.post("/public/transaction", async (req, res) => { @@
                     }
                 ]
             }).then();
-            res.status(500).send(`Failed to redeem - ${error}`);
+            res.status(500).send(`Failed to process redeem - ${error}`);
         }
     });
@@ Expand Down @@