Compare commits

..

1 Commits

Author SHA1 Message Date
renovate-bot 0da8f158c0 chore(deps): update https://gitea.t000-n.de/t.behrendt/conventional-semantic-git-tag-increment action to v0.1.30
renovate/stability-days Updates have met minimum release age requirement
CI / Test (pull_request) Successful in 12s
2026-03-27 17:46:47 +00:00
8 changed files with 16 additions and 94 deletions
-6
View File
@@ -1,6 +0,0 @@
*
!package.json
!bun.lockb
!src/
!tsconfig.json
+6 -6
View File
@@ -24,7 +24,7 @@ jobs:
- name: Checkout - name: Checkout
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0 - uses: oven-sh/setup-bun@ecf28ddc73e819eb6fa29df6b34ef8921c743461 # v2.1.3
with: with:
bun-version-file: ".bun-version" bun-version-file: ".bun-version"
@@ -55,7 +55,7 @@ jobs:
uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4 uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4
- name: Login to Registry - name: Login to Registry
uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0 uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
with: with:
registry: ${{ env.DOCKER_REGISTRY }} registry: ${{ env.DOCKER_REGISTRY }}
username: ${{ secrets.REGISTRY_USER }} username: ${{ secrets.REGISTRY_USER }}
@@ -68,7 +68,7 @@ jobs:
echo REPO_VERSION=$(git describe --tags --always | sed 's/^v//') >> $GITHUB_OUTPUT echo REPO_VERSION=$(git describe --tags --always | sed 's/^v//') >> $GITHUB_OUTPUT
- name: Build and push - name: Build and push
uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f # v7.1.0 uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7.0.0
with: with:
context: . context: .
file: ./Dockerfile file: ./Dockerfile
@@ -89,12 +89,12 @@ jobs:
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
with: with:
fetch-depth: 0 fetch-depth: 0
- uses: https://gitea.t000-n.de/t.behrendt/conventional-semantic-git-tag-increment@ef0c23189db33220a73022d8c29a27709d0df440 # 0.1.32 - uses: https://gitea.t000-n.de/t.behrendt/conventional-semantic-git-tag-increment@11c694022eefab5876ac346fc9ffc0464b2548c7 # 0.1.30
id: tag id: tag
with: with:
token: ${{ secrets.GITEA_TOKEN }} token: ${{ secrets.GITEA_TOKEN }}
prerelease: ${{ github.event_name == 'workflow_dispatch' }} prerelease: ${{ github.event_name == 'workflow_dispatch' }}
- uses: https://gitea.t000-n.de/t.behrendt/actions/release-git-tag@38c1bbd8bad3e7965744d03de85faa4a5b808d1b # 0.2.4 - uses: https://gitea.t000-n.de/t.behrendt/actions/release-git-tag@3925c92fc33f3d2bc87d28d21ab691b7e6dd6cdf # 0.2.1
with: with:
tag: ${{ steps.tag.outputs.new-tag }} tag: ${{ steps.tag.outputs.new-tag }}
- name: Set output - name: Set output
@@ -118,7 +118,7 @@ jobs:
echo REPO_VERSION=$(git describe --tags --always | sed 's/^v//') >> $GITHUB_OUTPUT echo REPO_VERSION=$(git describe --tags --always | sed 's/^v//') >> $GITHUB_OUTPUT
- name: Login to Registry - name: Login to Registry
uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0 uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
with: with:
registry: ${{ env.DOCKER_REGISTRY }} registry: ${{ env.DOCKER_REGISTRY }}
username: ${{ secrets.REGISTRY_USER }} username: ${{ secrets.REGISTRY_USER }}
+1 -1
View File
@@ -11,7 +11,7 @@ jobs:
- name: Checkout - name: Checkout
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0 - uses: oven-sh/setup-bun@ecf28ddc73e819eb6fa29df6b34ef8921c743461 # v2.1.3
with: with:
bun-version-file: ".bun-version" bun-version-file: ".bun-version"
-3
View File
@@ -130,6 +130,3 @@ dist
.yarn/install-state.gz .yarn/install-state.gz
.pnp.* .pnp.*
# Local docker test setup
gotify_data/
ts3_data/
BIN
View File
Binary file not shown.
-47
View File
@@ -1,47 +0,0 @@
services:
ts3gotify:
build:
context: .
dockerfile: Dockerfile
environment:
LOG_LEVEL: debug
TS3_HOST: ts3
TS3_QUERY_PORT: 10011
TS3_SERVER_PORT: 9987
TS3_USERNAME: serveradmin
TS3_PASSWORD: Qx7uUh4i
TS3_NICKNAME: ts3gotify
GOTIFY_URL: http://gotify:80
GOTIFY_TOKEN: ApvIy.aFpN3.QlQ
GOTIFY_TITLE: ts3gotify
MODE: '["connect", "disconnect", "moved", "message"]'
gotify:
image: ghcr.io/gotify/server:latest@sha256:a3af47067ce6aad76aadf5ba32d6ddfecd1ae576a961359f039fd1831e8b7652
ports:
- 8080:80
environment:
TZ: "Europe/Amsterdam"
GOTIFY_DEFAULTUSER_PASS: "admin"
volumes:
- "./gotify_data:/app/data"
ts3:
image: docker.io/library/teamspeak:latest@sha256:11fb1dd03c68ae7b3a8a86c5a08827d01d87a833177ad92ee5c19d7b72d08ce0
ports:
- name: voice
target: 9987
published: 9987
protocol: udp
- name: query
target: 10011
published: 10011
protocol: tcp
- name: filetransfer
target: 30033
published: 30033
protocol: tcp
environment:
TS3SERVER_LICENSE: accept
volumes:
- "./ts3_data:/var/ts3server/"
+3 -3
View File
@@ -8,9 +8,9 @@
"devDependencies": { "devDependencies": {
"@typescript-eslint/eslint-plugin": "5.62.0", "@typescript-eslint/eslint-plugin": "5.62.0",
"@typescript-eslint/parser": "5.62.0", "@typescript-eslint/parser": "5.62.0",
"cspell": "10.0.0", "cspell": "8.19.4",
"eslint": "8.57.1", "eslint": "8.57.1",
"typescript": "6.0.3", "typescript": "5.9.3",
"@types/bun": "latest" "@types/bun": "latest"
}, },
"dependencies": { "dependencies": {
@@ -18,7 +18,7 @@
"gotify": "1.1.0", "gotify": "1.1.0",
"pino": "10.3.1", "pino": "10.3.1",
"pino-pretty": "13.1.3", "pino-pretty": "13.1.3",
"ts3-nodejs-library": "3.5.3" "ts3-nodejs-library": "3.5.1"
}, },
"name": "ts3gotify", "name": "ts3gotify",
"module": "src/main.ts", "module": "src/main.ts",
+6 -28
View File
@@ -1,13 +1,13 @@
import type { Gotify } from "gotify"; import type { Gotify } from "gotify";
import type { Logger } from "pino"; import type { Logger } from "pino";
import type { TeamSpeak, TextMessageTargetMode } from "ts3-nodejs-library"; import type { TeamSpeak, TextMessageTargetMode } from "ts3-nodejs-library";
import type { GotifyConfig, Mode } from "./types";
import { import {
ClientConnect, ClientConnect,
ClientDisconnect, ClientDisconnect,
ClientMoved, ClientMoved,
TextMessage, TextMessage,
} from "ts3-nodejs-library/lib/types/Events"; } from "ts3-nodejs-library/lib/types/Events";
import type { GotifyConfig, Mode } from "./types";
function resolveMessageTarget(target: TextMessageTargetMode): string { function resolveMessageTarget(target: TextMessageTargetMode): string {
if (target === 1) { if (target === 1) {
@@ -43,11 +43,8 @@ export function ts3gotifyFactory(
ts3Client: TeamSpeak, ts3Client: TeamSpeak,
gotifyClient: Gotify, gotifyClient: Gotify,
gotifyConfig: GotifyConfig, gotifyConfig: GotifyConfig,
logger: Logger, logger: Logger
pingInterval = 2_500
) { ) {
let reconnectInProgress = false;
function sendNotification(message: string) { function sendNotification(message: string) {
gotifyClient gotifyClient
.send({ .send({
@@ -90,34 +87,15 @@ export function ts3gotifyFactory(
} }
} }
async function reconnectWithBackoff() {
if (reconnectInProgress) {
return;
}
reconnectInProgress = true;
logger.info("disconnected, trying to reconnect...");
try {
await ts3Client.reconnect(10, 2000);
logger.info("reconnected!");
} catch (error) {
const message = error instanceof Error ? error.message : String(error);
logger.error(`Error reconnecting to TS3 server: ${message}`);
} finally {
reconnectInProgress = false;
}
}
setInterval(() => ts3Client.version(true), pingInterval);
ts3Client.on("close", async () => { ts3Client.on("close", async () => {
await reconnectWithBackoff(); logger.info("disconnected, trying to reconnect...");
await ts3Client.reconnect(5, 1000);
logger.info("reconnected!");
}); });
ts3Client.on("error", (error: Error) => { ts3Client.on("error", (error: Error) => {
logger.error(`Error connecting to TS3 server: ${error.message}`); logger.error(`Error connecting to TS3 server: ${error.message}`);
reconnectWithBackoff(); process.exit(1);
}); });
return { return {