2.0.2

Dockerfile

@@ -1,6 +1,9 @@
 FROM node:10-alpine
 
 RUN apk add g++ make python
+RUN apk add tzdata
+
+ENV TZ America/Montreal
 
 RUN mkdir -p /home/node/app/node_modules && chown -R node:node /home/node/app
 

dist/bot.js

@@ -27,6 +27,7 @@ var _encryptAttachment = _interopRequireDefault(require("./encrypt-attachment"))
 
 global.Olm = require("olm");
 const BOT_SIGNAL_END_CHAT = 'END_CHAT';
+const BOT_SIGNAL_CHAT_OFFLINE = 'CHAT_OFFLINE';
 
 class OcrccBot {
   constructor(botConfig) {
@@ -149,7 +150,7 @@ class OcrccBot {
       } else {
         _logger.default.log('info', "NO FACILITATORS ONLINE");
 
-        this.sendNotice(roomId, "CHAT_OFFLINE");
+        this.sendBotSignal(roomId, BOT_SIGNAL_CHAT_OFFLINE);
       }
     } catch (err) {
       this.handleBotCrash(roomId, err);
@@ -574,10 +575,13 @@ class OcrccBot {
   }
 
   setTimeoutforFacilitator(roomId) {
-    setTimeout(() => {
+    setTimeout(async () => {
       const stillWaiting = this.localStorage.getItem(`${roomId}-waiting`);
 
       if (stillWaiting) {
+        _logger.default.log("info", `FACILITATOR DID NOT JOIN CHAT WITHIN TIME LIMIT, SENDING SIGNAL TO END CHAT`);
+
+        await this.sendTextMessage(roomId, this.config.CHAT_NOT_AVAILABLE_MESSAGE);
         this.sendBotSignal(roomId, BOT_SIGNAL_END_CHAT);
       }
     }, this.config.MAX_WAIT_TIME);
@@ -590,8 +594,10 @@ class OcrccBot {
       clearTimeout(oldTimeout);
     }
 
-    const newTimeout = setTimeout(() => {
+    const newTimeout = setTimeout(async () => {
-      this.sendTextMessage(roomId, `This chat has been closed due to inactivity.`);
+      _logger.default.log("info", `CHAT IS INACTIVE, SENDING SIGNAL TO END CHAT`);
+
+      await this.sendTextMessage(roomId, `This chat has been closed due to inactivity.`);
       this.sendBotSignal(roomId, BOT_SIGNAL_END_CHAT);
     }, this.config.MAX_INACTIVE);
     this.inactivityTimers[roomId] = newTimeout;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "private-safesupport-bot",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "description": "Chatbot to manage interactions on Safe Support Chat",
   "main": "dist/index.js",
   "scripts": {

src/bot.js

@@ -12,6 +12,7 @@ import logger from "./logger";
 import encrypt from "./encrypt-attachment";
 
 const BOT_SIGNAL_END_CHAT = 'END_CHAT'
+const BOT_SIGNAL_CHAT_OFFLINE = 'CHAT_OFFLINE'
 
 
 class OcrccBot {
@@ -130,7 +131,7 @@ class OcrccBot {
         this.localStorage.setItem(`${roomId}-invitations`, invitations)
       } else {
         logger.log('info', "NO FACILITATORS ONLINE")
-        this.sendNotice(roomId, "CHAT_OFFLINE")
+        this.sendBotSignal(roomId, BOT_SIGNAL_CHAT_OFFLINE)
       }
 
     } catch(err) {
@@ -596,9 +597,14 @@ class OcrccBot {
   }
 
   setTimeoutforFacilitator(roomId) {
-    setTimeout(() => {
+    setTimeout(async() => {
       const stillWaiting = this.localStorage.getItem(`${roomId}-waiting`)
       if (stillWaiting) {
+        logger.log("info", `FACILITATOR DID NOT JOIN CHAT WITHIN TIME LIMIT, SENDING SIGNAL TO END CHAT`);
+        await this.sendTextMessage(
+          roomId,
+          this.config.CHAT_NOT_AVAILABLE_MESSAGE
+        );
         this.sendBotSignal(roomId, BOT_SIGNAL_END_CHAT)
       }
     }, this.config.MAX_WAIT_TIME)
@@ -611,8 +617,9 @@ class OcrccBot {
       clearTimeout(oldTimeout);
     }
 
-    const newTimeout = setTimeout(() => {
+    const newTimeout = setTimeout(async() => {
-      this.sendTextMessage(
+      logger.log("info", `CHAT IS INACTIVE, SENDING SIGNAL TO END CHAT`);
+      await this.sendTextMessage(
         roomId,
         `This chat has been closed due to inactivity.`
       );