fix(core.gbapp): Healthly status fixed for WhatsApp.

GeneralBots · May 12, 2020 · 7fbb4cc · 7fbb4cc
1 parent bb95f3d
commit 7fbb4cc
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/packages/core.gbapp/services/GBMinService.ts b/packages/core.gbapp/services/GBMinService.ts
@@ -249,7 +249,13 @@ export class GBMinService {
     server.get(`/${min.instance.botId}/check`, async (req, res) => {
       try {
         if (min.whatsAppDirectLine != undefined && instance.whatsappServiceKey !== null) {
-          min.whatsAppDirectLine.check(min);
+          if (!await min.whatsAppDirectLine.check(min)) {
+            const error = `WhatsApp API lost connection.`;
+            GBLog.error(error);
+            res.status(500).send(error);
+
+            return;
+          }
         }
         res.status(200).send(`General Bot ${min.botId} is healthly.`);
       } catch (error) {

diff --git a/packages/whatsapp.gblib/services/WhatsappDirectLine.ts b/packages/whatsapp.gblib/services/WhatsappDirectLine.ts
@@ -132,7 +132,7 @@ export class WhatsappDirectLine extends GBService {
 
   public async check() {
 
-    GBLog.info(`GBWhatsapp: Cheking server...`);
+    GBLog.info(`GBWhatsapp: Checking server...`);
 
     const options = {
       url: urlJoin(this.whatsappServiceUrl, 'status') + `?token=${this.min.instance.whatsappServiceKey}` ,
@@ -141,8 +141,8 @@ export class WhatsappDirectLine extends GBService {
     };
 
     const res = await request(options);
-
-    return res.body.accountStatus === "authenticated";
+    const json = JSON.parse(res);
+    return json.accountStatus === "authenticated";
 
   }