#4 fixed event handling

.env

@@ -0,0 +1 @@
+EXPOSE=7003

config.example.yml

@@ -1,10 +1,10 @@
 http:
-  port: 3002
+  port: 80
 telegram:
   # Get it from bot father
   key: ''
   webhook:
-    url: https://something.org:3002/webhook
+    url: https://something.org/webhook
     enabled: false
 postgres:
   uri: postgres://user:password@db/bot

docker/Dockerfile

@@ -0,0 +1,15 @@
+FROM node:lts-fermium
+
+WORKDIR /app
+RUN rm -rf /app/*
+
+COPY ./package.json .
+COPY ./yarn.lock .
+RUN yarn
+COPY . .
+RUN yarn build
+WORKDIR /app/dist
+
+EXPOSE ${EXPOSE}
+HEALTHCHECK --interval=5m --timeout=30s CMD curl -f http://localhost/ || kill -s 2 1
+CMD ["node", "./index.js"]

docker/docker-compose.yml

@@ -0,0 +1,32 @@
+version: '3.4'
+services:
+  db:
+    container_name: bot-db
+    image: postgres:11-alpine
+    ports:
+      - 5432:5432
+    environment:
+      POSTGRES_USER: user
+      POSTGRES_PASSWORD: password
+      POSTGRES_DB: bot
+    volumes:
+      - bot-db:/var/lib/postgresql/data
+      - /etc/localtime:/etc/localtime:ro
+  app:
+    restart: always
+    environment:
+      PORT: 80
+    build:
+      context: ../
+      dockerfile: ./docker/Dockerfile
+    ports:
+      - ${EXPOSE}:80
+    volumes:
+      - /etc/localtime:/etc/localtime:ro
+      - node_modules:/app/node_modules
+    entrypoint: node ./index.js
+    depends_on:
+      - db
+volumes:
+  bot-db:
+  node_modules:

docker/wait-for-it.sh

@@ -0,0 +1,182 @@
+#!/usr/bin/env bash
+# Use this script to test if a given TCP host/port are available
+
+WAITFORIT_cmdname=${0##*/}
+
+echoerr() { if [[ $WAITFORIT_QUIET -ne 1 ]]; then echo "$@" 1>&2; fi }
+
+usage()
+{
+    cat << USAGE >&2
+Usage:
+    $WAITFORIT_cmdname host:port [-s] [-t timeout] [-- command args]
+    -h HOST | --host=HOST       Host or IP under test
+    -p PORT | --port=PORT       TCP port under test
+                                Alternatively, you specify the host and port as host:port
+    -s | --strict               Only execute subcommand if the test succeeds
+    -q | --quiet                Don't output any status messages
+    -t TIMEOUT | --timeout=TIMEOUT
+                                Timeout in seconds, zero for no timeout
+    -- COMMAND ARGS             Execute command with args after the test finishes
+USAGE
+    exit 1
+}
+
+wait_for()
+{
+    if [[ $WAITFORIT_TIMEOUT -gt 0 ]]; then
+        echoerr "$WAITFORIT_cmdname: waiting $WAITFORIT_TIMEOUT seconds for $WAITFORIT_HOST:$WAITFORIT_PORT"
+    else
+        echoerr "$WAITFORIT_cmdname: waiting for $WAITFORIT_HOST:$WAITFORIT_PORT without a timeout"
+    fi
+    WAITFORIT_start_ts=$(date +%s)
+    while :
+    do
+        if [[ $WAITFORIT_ISBUSY -eq 1 ]]; then
+            nc -z $WAITFORIT_HOST $WAITFORIT_PORT
+            WAITFORIT_result=$?
+        else
+            (echo > /dev/tcp/$WAITFORIT_HOST/$WAITFORIT_PORT) >/dev/null 2>&1
+            WAITFORIT_result=$?
+        fi
+        if [[ $WAITFORIT_result -eq 0 ]]; then
+            WAITFORIT_end_ts=$(date +%s)
+            echoerr "$WAITFORIT_cmdname: $WAITFORIT_HOST:$WAITFORIT_PORT is available after $((WAITFORIT_end_ts - WAITFORIT_start_ts)) seconds"
+            break
+        fi
+        sleep 1
+    done
+    return $WAITFORIT_result
+}
+
+wait_for_wrapper()
+{
+    # In order to support SIGINT during timeout: http://unix.stackexchange.com/a/57692
+    if [[ $WAITFORIT_QUIET -eq 1 ]]; then
+        timeout $WAITFORIT_BUSYTIMEFLAG $WAITFORIT_TIMEOUT $0 --quiet --child --host=$WAITFORIT_HOST --port=$WAITFORIT_PORT --timeout=$WAITFORIT_TIMEOUT &
+    else
+        timeout $WAITFORIT_BUSYTIMEFLAG $WAITFORIT_TIMEOUT $0 --child --host=$WAITFORIT_HOST --port=$WAITFORIT_PORT --timeout=$WAITFORIT_TIMEOUT &
+    fi
+    WAITFORIT_PID=$!
+    trap "kill -INT -$WAITFORIT_PID" INT
+    wait $WAITFORIT_PID
+    WAITFORIT_RESULT=$?
+    if [[ $WAITFORIT_RESULT -ne 0 ]]; then
+        echoerr "$WAITFORIT_cmdname: timeout occurred after waiting $WAITFORIT_TIMEOUT seconds for $WAITFORIT_HOST:$WAITFORIT_PORT"
+    fi
+    return $WAITFORIT_RESULT
+}
+
+# process arguments
+while [[ $# -gt 0 ]]
+do
+    case "$1" in
+        *:* )
+        WAITFORIT_hostport=(${1//:/ })
+        WAITFORIT_HOST=${WAITFORIT_hostport[0]}
+        WAITFORIT_PORT=${WAITFORIT_hostport[1]}
+        shift 1
+        ;;
+        --child)
+        WAITFORIT_CHILD=1
+        shift 1
+        ;;
+        -q | --quiet)
+        WAITFORIT_QUIET=1
+        shift 1
+        ;;
+        -s | --strict)
+        WAITFORIT_STRICT=1
+        shift 1
+        ;;
+        -h)
+        WAITFORIT_HOST="$2"
+        if [[ $WAITFORIT_HOST == "" ]]; then break; fi
+        shift 2
+        ;;
+        --host=*)
+        WAITFORIT_HOST="${1#*=}"
+        shift 1
+        ;;
+        -p)
+        WAITFORIT_PORT="$2"
+        if [[ $WAITFORIT_PORT == "" ]]; then break; fi
+        shift 2
+        ;;
+        --port=*)
+        WAITFORIT_PORT="${1#*=}"
+        shift 1
+        ;;
+        -t)
+        WAITFORIT_TIMEOUT="$2"
+        if [[ $WAITFORIT_TIMEOUT == "" ]]; then break; fi
+        shift 2
+        ;;
+        --timeout=*)
+        WAITFORIT_TIMEOUT="${1#*=}"
+        shift 1
+        ;;
+        --)
+        shift
+        WAITFORIT_CLI=("$@")
+        break
+        ;;
+        --help)
+        usage
+        ;;
+        *)
+        echoerr "Unknown argument: $1"
+        usage
+        ;;
+    esac
+done
+
+if [[ "$WAITFORIT_HOST" == "" || "$WAITFORIT_PORT" == "" ]]; then
+    echoerr "Error: you need to provide a host and port to test."
+    usage
+fi
+
+WAITFORIT_TIMEOUT=${WAITFORIT_TIMEOUT:-15}
+WAITFORIT_STRICT=${WAITFORIT_STRICT:-0}
+WAITFORIT_CHILD=${WAITFORIT_CHILD:-0}
+WAITFORIT_QUIET=${WAITFORIT_QUIET:-0}
+
+# Check to see if timeout is from busybox?
+WAITFORIT_TIMEOUT_PATH=$(type -p timeout)
+WAITFORIT_TIMEOUT_PATH=$(realpath $WAITFORIT_TIMEOUT_PATH 2>/dev/null || readlink -f $WAITFORIT_TIMEOUT_PATH)
+
+WAITFORIT_BUSYTIMEFLAG=""
+if [[ $WAITFORIT_TIMEOUT_PATH =~ "busybox" ]]; then
+    WAITFORIT_ISBUSY=1
+    # Check if busybox timeout uses -t flag
+    # (recent Alpine versions don't support -t anymore)
+    if timeout &>/dev/stdout | grep -q -e '-t '; then
+        WAITFORIT_BUSYTIMEFLAG="-t"
+    fi
+else
+    WAITFORIT_ISBUSY=0
+fi
+
+if [[ $WAITFORIT_CHILD -gt 0 ]]; then
+    wait_for
+    WAITFORIT_RESULT=$?
+    exit $WAITFORIT_RESULT
+else
+    if [[ $WAITFORIT_TIMEOUT -gt 0 ]]; then
+        wait_for_wrapper
+        WAITFORIT_RESULT=$?
+    else
+        wait_for
+        WAITFORIT_RESULT=$?
+    fi
+fi
+
+if [[ $WAITFORIT_CLI != "" ]]; then
+    if [[ $WAITFORIT_RESULT -ne 0 && $WAITFORIT_STRICT -eq 1 ]]; then
+        echoerr "$WAITFORIT_cmdname: strict mode, refusing to execute subprocess"
+        exit $WAITFORIT_RESULT
+    fi
+    exec "${WAITFORIT_CLI[@]}"
+else
+    exit $WAITFORIT_RESULT
+fi

src/service/db/index.ts

@@ -10,7 +10,8 @@ export interface Storage {
     groupId: number,
     channel: string
   ): Promise<Event | undefined>;
-  getEventById(
+  getEventById(eventId: number): Promise<Event | undefined>;
+  getEventByVKEventId(
     type: VkEvent,
     eventId: number,
     groupId: number,

src/service/db/postgres/index.ts

@@ -19,6 +19,8 @@ export class PostgresDB implements Storage {
   constructor(private config: PostgresConfig) {}
 
   connect = async () => {
+    logger.info(`connecting to ${this.config.uri}`);
+
     this.connection = await createConnection({
       type: "postgres",
       url: this.config.uri,
@@ -50,19 +52,24 @@ export class PostgresDB implements Storage {
     });
   };
 
-  getEventById = async (
+  getEventByVKEventId = async (
     type: VkEvent,
-    id: number,
+    vkEventId: number,
     vkGroupId: number,
     channel: string
   ) => {
     return await this.events.findOne({
       type,
-      id,
+      vkEventId,
       vkGroupId,
       channel,
     });
   };
+  getEventById = async (id: number) => {
+    return await this.events.findOne({
+      id,
+    });
+  };
 
   createEvent = async (
     type: VkEvent,

src/service/vk/handlers/PostNewHandler.ts

@@ -60,7 +60,7 @@ export class PostNewHandler extends VkEventHandler<Fields, Values> {
       return;
     }
 
-    const exist = await this.getEventById(id);
+    const exist = await this.getEventByVkEventId(id);
     if (exist) {
       logger.warn(
         `received duplicate entry for ${this.group.name}, ${this.type}, ${id}`
@@ -212,13 +212,13 @@ export class PostNewHandler extends VkEventHandler<Fields, Values> {
 
       return this.likes.map((like) => ({
         text: withCount[like] ? `${like} ${withCount[like]}` : like,
-        callback_data: `/like ${this.channel} ${like}`,
+        callback_data: `/like ${this.channel.id} ${like}`,
       }));
     }
 
     return this.likes.map((like) => ({
       text: like,
-      callback_data: `/like ${this.channel} ${like}`,
+      callback_data: `/like ${this.channel.id} ${like}`,
     }));
   };
 
@@ -254,11 +254,16 @@ export class PostNewHandler extends VkEventHandler<Fields, Values> {
     const [, channel, emo] = ctx.match;
     const event = await this.getEventByTgMessageId(id);
 
+    if (!event) {
+      logger.warn(`event not found for tgMessageId ${id}`);
+      await next();
+      return;
+    }
+
     if (
       !channel ||
       !emo ||
       !id ||
-      !event ||
       channel != this.channel.id ||
       !this.likes.includes(emo)
     ) {

src/service/vk/handlers/VkEventHandler.ts

@@ -56,7 +56,18 @@ export class VkEventHandler<
       return undefined;
     }
 
-    return await this.db.getEventById(
+    return await this.db.getEventById(id);
+  };
+
+  /**
+   * Checks for duplicates
+   */
+  getEventByVkEventId = async (id?: number): Promise<Event | undefined> => {
+    if (!id) {
+      return undefined;
+    }
+
+    return await this.db.getEventByVKEventId(
       this.type,
       id,
       this.group.id,