Upload 4 files

Dockerfile

@@ -3,12 +3,13 @@ FROM divideprojects/docker-telegram-bot-api:latest
 ENV TELEGRAM_API_ID=$TELEGRAM_API_ID
 ENV TELEGRAM_API_HASH=$TELEGRAM_API_HASH
 ENV TELEGRAM_LOCAL=true
+ENV EXPRESS_PORT=15782
 
 # Устанавливаем Node.js с помощью Alpine package manager
 RUN apk add --no-cache nodejs npm
 
 # Также устанавливаем необходимые утилиты
-RUN apk add --no-cache wget tar gzip findutils coreutils
+RUN apk add --no-cache wget tar gzip findutils coreutils openssh-client
 
 # Создаем директорию для данных и даем права
 RUN mkdir -p /var/lib/telegram-bot-api && \
@@ -16,13 +17,14 @@ RUN mkdir -p /var/lib/telegram-bot-api && \
 
 # Создаем директорию для скрипта статистики
 WORKDIR /app
-COPY package.json stats-reporter.js ./
+COPY package.json stats-reporter.js server.mjs ./
 
 # Устанавливаем зависимости
 RUN npm install
 
 # Для Hugging Face нужен порт 7860
 EXPOSE 7860
+EXPOSE ${EXPRESS_PORT}
 
 # Запускаем и telegram-bot-api, и скрипт статистики
 COPY start.sh /

package.json

@@ -1,14 +1,16 @@
 {
   "name": "telegram-bot-api-stats-reporter",
   "version": "1.0.0",
-  "description": "Reports statistics about Telegram Bot API to GitHub Gists",
+  "description": "Reports statistics about Telegram Bot API to GitHub Gists and runs an Express server",
   "main": "stats-reporter.js",
   "type": "module",
   "scripts": {
-    "start": "node stats-reporter.js"
+    "start": "node stats-reporter.js",
+    "start-server": "node server.mjs"
   },
   "dependencies": {
-    "node-fetch": "^3.3.2"
+    "node-fetch": "^3.3.2",
+    "express": "^4.18.2"
   },
   "engines": {
     "node": ">=16"

server.mjs

@@ -0,0 +1,12 @@
+import express from 'express';
+
+const app = express();
+const port = process.env.EXPRESS_PORT || 15782;
+
+app.get('/', (req, res) => {
+  res.send('Hello World from Express on Alpine!');
+});
+
+app.listen(port, '0.0.0.0', () => {
+  console.log(`[${new Date().toISOString()}] Express server listening on port ${port}`);
+});

start.sh

@@ -1,20 +1,54 @@
 #!/bin/sh
 set -e
 
+EXPRESS_PORT_EFFECTIVE=${EXPRESS_PORT:-15782}
+
 # Запускаем telegram-bot-api как основной процесс
 telegram-bot-api --local --http-port=7860 --dir=/var/lib/telegram-bot-api --temp-dir=/var/lib/telegram-bot-api &
 TELEGRAM_PID=$!
+echo "[$(date +%Y-%m-%dT%H:%M:%S%Z)] Telegram Bot API started with PID $TELEGRAM_PID on port 7860"
 
 # Запускаем скрипт статистики
 cd /app
 node stats-reporter.js &
-NODE_PID=$!
+NODE_STATS_PID=$!
+echo "[$(date +%Y-%m-%dT%H:%M:%S%Z)] Stats reporter script started with PID $NODE_STATS_PID"
+
+node server.mjs &
+NODE_EXPRESS_PID=$!
+echo "[$(date +%Y-%m-%dT%H:%M:%S%Z)] Express server started with PID $NODE_EXPRESS_PID on port $EXPRESS_PORT_EFFECTIVE"
+
+echo "[$(date +%Y-%m-%dT%H:%M:%S%Z)] Attempting to start SSH tunnel for port $EXPRESS_PORT_EFFECTIVE via tunnel.us.hostux.net..."
+ssh -o StrictHostKeyChecking=no \
+    -o UserKnownHostsFile=/dev/null \
+    -o ExitOnForwardFailure=yes \
+    -o LogLevel=ERROR \
+    -R 80:localhost:$EXPRESS_PORT_EFFECTIVE \
+    tunnel.us.hostux.net > /tmp/tunnel.log 2>&1 &
+TUNNEL_PID=$!
+echo "[$(date +%Y-%m-%dT%H:%M:%S%Z)] SSH tunnel process started with PID $TUNNEL_PID. Check /tmp/tunnel.log for URL and status."
+
+sleep 10
+echo "[$(date +%Y-%m-%dT%H:%M:%S%Z)] SSH tunnel log (/tmp/tunnel.log) content:"
+if [ -f /tmp/tunnel.log ]; then
+  cat /tmp/tunnel.log
+else
+  echo "/tmp/tunnel.log not found."
+fi
+echo "[$(date +%Y-%m-%dT%H:%M:%S%Z)] End of SSH tunnel log."
 
 # Настраиваем перехват сигналов
-trap "kill $TELEGRAM_PID $NODE_PID; exit" SIGINT SIGTERM
+trap "echo '[$(date +%Y-%m-%dT%H:%M:%S%Z)] Caught SIGINT/SIGTERM, shutting down...'; \
+      kill $TELEGRAM_PID $NODE_STATS_PID $NODE_EXPRESS_PID $TUNNEL_PID 2>/dev/null || true; \
+      echo '[$(date +%Y-%m-%dT%H:%M:%S%Z)] Shutdown complete.'; \
+      exit 0" SIGINT SIGTERM
 
-# Ожидаем завершения основного процесса
+echo "[$(date +%Y-%m-%dT%H:%M:%S%Z)] Waiting for Telegram Bot API (PID $TELEGRAM_PID) to exit..."
 wait $TELEGRAM_PID
-# Если основной процесс завершился, останавливаем все
-kill $NODE_PID
-exit
+EXIT_CODE=$?
+echo "[$(date +%Y-%m-%dT%H:%M:%S%Z)] Telegram Bot API process (PID $TELEGRAM_PID) exited with code $EXIT_CODE."
+
+echo "[$(date +%Y-%m-%dT%H:%M:%S%Z)] Main process exited, ensuring other processes are stopped..."
+kill $NODE_STATS_PID $NODE_EXPRESS_PID $TUNNEL_PID 2>/dev/null || true
+echo "[$(date +%Y-%m-%dT%H:%M:%S%Z)] Script finished."
+exit $EXIT_CODE