diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml new file mode 100644 index 0000000..8aba4db --- /dev/null +++ b/.gitea/workflows/deploy.yaml @@ -0,0 +1,18 @@ +name: deploy +on: + push: + branches: [main] + +jobs: + update-bot: + runs-on: jino + steps: + - name: fetch code + uses: actions/checkout@v4 + - name: copy + run: rsync -avz --delete backend/ /var/www/redschinese --exclude .git --exclude .gitea + - name: rebuild and load + run: | + cd /var/www/redschinese + docker compose down + docker compose up -d --build \ No newline at end of file diff --git a/.gitea/workflows/update.yaml b/.gitea/workflows/update.yaml deleted file mode 100644 index aecdab9..0000000 --- a/.gitea/workflows/update.yaml +++ /dev/null @@ -1,8 +0,0 @@ -name: update -branch: [main] -on: [push] - -jobs: - update-bot: - runs-on: ubunru-latest - steps: \ No newline at end of file diff --git a/backend/bot/Dockerfile b/backend/bot/Dockerfile new file mode 100644 index 0000000..e69de29 diff --git a/backend/bot/bun.lock b/backend/bot/bun.lock new file mode 100644 index 0000000..f634152 --- /dev/null +++ b/backend/bot/bun.lock @@ -0,0 +1,20 @@ +{ + "lockfileVersion": 2, + "configVersion": 1, + "workspaces": { + "": { + "devDependencies": { + "@types/bun": "latest", + }, + }, + }, + "packages": { + "@types/bun": ["@types/bun@1.4.4", "", { "dependencies": { "bun-types": "1.4.4" } }, "sha512-9wkRDXUXK124pEnAutE6n/l18j+i9GC5IAHK8TmX/2nlySETmky0OU6yL5U8pW1AoKh++AN9auDCr647BfurjQ=="], + + "@types/node": ["@types/node@26.6.6", "", { "dependencies": { "undici-types": "~8.9.0" } }, "sha512-MzQj+8Kx3XI40OmUAE6Qoh58ZMNstNNMwn2nfd3qWsfe7nDNSqJNzes4njhz6AHwrSHOffSLwXU6yb474Q4aog=="], + + "bun-types": ["bun-types@1.4.4", "", { "dependencies": { "@types/node": "*", "undici-types": "*" } }, "sha512-yjrJh5oGX7mMPKGd19YXyIjmEuj4G4zNC30bs7PM9Az7NQ3ndF3j6hbeRdvJTRQEhJ/FYQwW0a2moweEi2hMxQ=="], + + "undici-types": ["undici-types@8.9.0", "", {}, "sha512-KTDyRTYX8sWmKXAikPHHSyc63CRPETMctyjKFupcC6OBLXT3xsN0e9aF7m+mIXutFWpUXuedtowG7iLOzp0kQg=="], + } +} diff --git a/backend/package.json b/backend/bot/package.json similarity index 54% rename from backend/package.json rename to backend/bot/package.json index 2fe6178..10919dc 100644 --- a/backend/package.json +++ b/backend/bot/package.json @@ -1,8 +1,5 @@ { "devDependencies": { "@types/bun": "latest" - }, - "dependencies": { - "grammy": "^1.46.0" } } diff --git a/backend/bot/src/bot.js b/backend/bot/src/bot.js new file mode 100644 index 0000000..eef7b56 --- /dev/null +++ b/backend/bot/src/bot.js @@ -0,0 +1,9 @@ +import { Bot } from "grammy"; + +const botToken = await Bun.file("/run/secrets/bottoken").text(); + +const bot = new Bot(botToken); + +bot.command("start", (ctx) => ctx.reply("Welcome! Up and running.")); + +bot.start(); diff --git a/backend/tsconfig.json b/backend/bot/tsconfig.json similarity index 100% rename from backend/tsconfig.json rename to backend/bot/tsconfig.json diff --git a/backend/bun.lock b/backend/bun.lock deleted file mode 100644 index 11c209f..0000000 --- a/backend/bun.lock +++ /dev/null @@ -1,43 +0,0 @@ -{ - "lockfileVersion": 2, - "configVersion": 1, - "workspaces": { - "": { - "dependencies": { - "grammy": "^1.46.0", - }, - "devDependencies": { - "@types/bun": "latest", - }, - }, - }, - "packages": { - "@grammyjs/types": ["@grammyjs/types@5.0.0", "", {}, "sha512-iq1Qrq1iPKkB8yAa0qSuIURMZOCuqTY5pWy5gHpCeL1oQ+GPadGhw/cDTVE8waJwuCzacUzuIjRv1sESvk7u7A=="], - - "@types/bun": ["@types/bun@1.4.4", "", { "dependencies": { "bun-types": "1.4.4" } }, "sha512-9wkRDXUXK124pEnAutE6n/l18j+i9GC5IAHK8TmX/2nlySETmky0OU6yL5U8pW1AoKh++AN9auDCr647BfurjQ=="], - - "@types/node": ["@types/node@26.6.6", "", { "dependencies": { "undici-types": "~8.9.0" } }, "sha512-MzQj+8Kx3XI40OmUAE6Qoh58ZMNstNNMwn2nfd3qWsfe7nDNSqJNzes4njhz6AHwrSHOffSLwXU6yb474Q4aog=="], - - "abort-controller": ["abort-controller@3.0.0", "", { "dependencies": { "event-target-shim": "^5.0.0" } }, "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg=="], - - "bun-types": ["bun-types@1.4.4", "", { "dependencies": { "@types/node": "*", "undici-types": "*" } }, "sha512-yjrJh5oGX7mMPKGd19YXyIjmEuj4G4zNC30bs7PM9Az7NQ3ndF3j6hbeRdvJTRQEhJ/FYQwW0a2moweEi2hMxQ=="], - - "debug": ["debug@4.4.3", "", { "dependencies": { "ms": "^2.1.3" }, "peerDependencies": { "supports-color": "*" }, "optionalPeers": ["supports-color"] }, "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA=="], - - "event-target-shim": ["event-target-shim@5.0.1", "", {}, "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ=="], - - "grammy": ["grammy@1.46.0", "", { "dependencies": { "@grammyjs/types": "5.0.0", "abort-controller": "^3.0.0", "debug": "^4.4.3", "node-fetch": "^2.7.0" } }, "sha512-/8Qw+iisrUdOMk+p2mjEHouMm/BBdBEN1DHh16wiTpRUZkxDG3PxexdjCvR+wvK3LWPdrEvnQbdrwpU954sPhg=="], - - "ms": ["ms@2.1.3", "", {}, "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="], - - "node-fetch": ["node-fetch@2.7.0", "", { "dependencies": { "whatwg-url": "^5.0.0" }, "peerDependencies": { "encoding": "^0.1.0" }, "optionalPeers": ["encoding"] }, "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A=="], - - "tr46": ["tr46@0.0.3", "", {}, "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="], - - "undici-types": ["undici-types@8.9.0", "", {}, "sha512-KTDyRTYX8sWmKXAikPHHSyc63CRPETMctyjKFupcC6OBLXT3xsN0e9aF7m+mIXutFWpUXuedtowG7iLOzp0kQg=="], - - "webidl-conversions": ["webidl-conversions@3.0.1", "", {}, "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="], - - "whatwg-url": ["whatwg-url@5.0.0", "", { "dependencies": { "tr46": "~0.0.3", "webidl-conversions": "^3.0.0" } }, "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw=="], - } -} diff --git a/backend/docker-compose.yaml b/backend/docker-compose.yaml new file mode 100644 index 0000000..d332790 --- /dev/null +++ b/backend/docker-compose.yaml @@ -0,0 +1,11 @@ +services: + bot: + build: ./bot + restart: unless-stopped + secrets: + - bottoken + + +secrets: + bottoken: + file: /var/secrets/bottoken \ No newline at end of file diff --git a/backend/src/bot/bot.js b/backend/src/bot/bot.js deleted file mode 100644 index 54fc6cc..0000000 --- a/backend/src/bot/bot.js +++ /dev/null @@ -1,7 +0,0 @@ -import { Bot } from "grammy" - -const botToken = await Bun.file("/var/secrets/bottoken").text() - -const bot = new Bot(botToken) - -bot.command("start", (ctx) => ctx.reply("Welcome! Up and running.")); \ No newline at end of file