chore(deps): update https://gitea.t000-n.de/t.behrendt/conventional-semantic-git-tag-increment action to v0.1.30

.dockerignore

@@ -1,6 +0,0 @@
-*
-
-!package.json
-!bun.lockb
-!src/
-!tsconfig.json

.gitea/workflows/cd.yaml

@@ -24,7 +24,7 @@ jobs:
       - name: Checkout
         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:
           bun-version-file: ".bun-version"
 
@@ -41,7 +41,7 @@ jobs:
     name: Build and push
     strategy:
       matrix:
-        arch: [amd64]
+        arch: [ amd64, arm64 ]
     needs:
       - test
     runs-on:
@@ -52,10 +52,10 @@ jobs:
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4.1.0
+        uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4
 
       - name: Login to Registry
-        uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
+        uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
         with:
           registry: ${{ env.DOCKER_REGISTRY }}
           username: ${{ secrets.REGISTRY_USER }}
@@ -68,7 +68,7 @@ jobs:
           echo REPO_VERSION=$(git describe --tags --always | sed 's/^v//') >> $GITHUB_OUTPUT
 
       - name: Build and push
-        uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f # v7.1.0
+        uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7.0.0
         with:
           context: .
           file: ./Dockerfile
@@ -77,8 +77,6 @@ jobs:
           provenance: false
           tags: |
             ${{ env.DOCKER_REGISTRY }}/t.behrendt/${{ steps.meta.outputs.REPO_NAME }}:${{ steps.meta.outputs.REPO_VERSION }}-${{ matrix.arch }}
-          cache-from: type=registry,ref=${{ env.DOCKER_REGISTRY }}/t.behrendt/${{ steps.meta.outputs.REPO_NAME }}:cache
-          cache-to: type=registry,ref=${{ env.DOCKER_REGISTRY }}/t.behrendt/${{ steps.meta.outputs.REPO_NAME }}:cache,mode=max
 
   create_tag:
     name: Create tag
@@ -91,12 +89,12 @@ jobs:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           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
         with:
           token: ${{ secrets.GITEA_TOKEN }}
           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:
           tag: ${{ steps.tag.outputs.new-tag }}
       - name: Set output
@@ -120,7 +118,7 @@ jobs:
           echo REPO_VERSION=$(git describe --tags --always | sed 's/^v//') >> $GITHUB_OUTPUT
 
       - name: Login to Registry
-        uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
+        uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
         with:
           registry: ${{ env.DOCKER_REGISTRY }}
           username: ${{ secrets.REGISTRY_USER }}
@@ -129,6 +127,7 @@ jobs:
       - name: Create manifest
         run: |
           docker manifest create ${{ env.DOCKER_REGISTRY }}/t.behrendt/${{ steps.meta.outputs.REPO_NAME }}:${{ needs.create_tag.outputs.tag }} \
-            ${{ env.DOCKER_REGISTRY }}/t.behrendt/${{ steps.meta.outputs.REPO_NAME }}:${{ steps.meta.outputs.REPO_VERSION }}-amd64
+            ${{ env.DOCKER_REGISTRY }}/t.behrendt/${{ steps.meta.outputs.REPO_NAME }}:${{ steps.meta.outputs.REPO_VERSION }}-amd64 \
+            ${{ env.DOCKER_REGISTRY }}/t.behrendt/${{ steps.meta.outputs.REPO_NAME }}:${{ steps.meta.outputs.REPO_VERSION }}-arm64
 
           docker manifest push ${{ env.DOCKER_REGISTRY }}/t.behrendt/${{ steps.meta.outputs.REPO_NAME }}:${{ needs.create_tag.outputs.tag }}

.gitea/workflows/ci.yaml

@@ -3,9 +3,6 @@ name: CI
 on:
   pull_request:
 
-env:
-  DOCKER_REGISTRY: gitea.t000-n.de
-
 jobs:
   test:
     name: Test
@@ -14,20 +11,11 @@ jobs:
       - name: Checkout
         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:
           bun-version-file: ".bun-version"
 
-      - name: Cache dependencies
-        id: cache-deps
-        uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
-        with:
-          path: |
-            node_modules
-          key: ${{ runner.os }}-bun-${{ hashFiles('bun.lockb') }}
-
       - name: Install dependencies
-        if: steps.cache-deps.outputs.cache-hit != 'true'
         run: bun install --frozen-lockfile
 
       - name: Run lint
@@ -35,40 +23,3 @@ jobs:
 
       - name: Run spellcheck
         run: bun run check:spell
-
-  build-check:
-    name: Build check
-    runs-on:
-      - ubuntu-latest
-      - linux_amd64
-    steps:
-      - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4.1.0
-
-      - name: Login to Registry
-        uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
-        with:
-          registry: ${{ env.DOCKER_REGISTRY }}
-          username: ${{ secrets.REGISTRY_USER }}
-          password: ${{ secrets.REGISTRY_PASSWORD }}
-
-      - name: Get Metadata
-        id: meta
-        run: |
-          echo REPO_NAME=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $2}' | tr '[:upper:]' '[:lower:]') >> $GITHUB_OUTPUT
-          echo REPO_VERSION=$(git describe --tags --always | sed 's/^v//') >> $GITHUB_OUTPUT
-
-      - name: Build image
-        uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f # v7.1.0
-        with:
-          context: .
-          file: ./Dockerfile
-          platforms: linux/amd64
-          push: false
-          load: true
-          provenance: false
-          cache-from: type=registry,ref=${{ env.DOCKER_REGISTRY }}/t.behrendt/${{ steps.meta.outputs.REPO_NAME }}:cache
-          cache-to: type=registry,ref=${{ env.DOCKER_REGISTRY }}/t.behrendt/${{ steps.meta.outputs.REPO_NAME }}:cache,mode=max

.gitignore

@@ -130,6 +130,3 @@ dist
 .yarn/install-state.gz
 .pnp.*
 
-# Local docker test setup
-gotify_data/
-ts3_data/

compose.yaml

@@ -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/"

package.json

@@ -6,11 +6,11 @@
     "start": "bun run src/main.ts"
   },
   "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "8.59.4",
-    "@typescript-eslint/parser": "8.59.4",
-    "cspell": "10.0.0",
+    "@typescript-eslint/eslint-plugin": "5.62.0",
+    "@typescript-eslint/parser": "5.62.0",
+    "cspell": "8.19.4",
     "eslint": "8.57.1",
-    "typescript": "6.0.3",
+    "typescript": "5.9.3",
     "@types/bun": "latest"
   },
   "dependencies": {
@@ -18,7 +18,7 @@
     "gotify": "1.1.0",
     "pino": "10.3.1",
     "pino-pretty": "13.1.3",
-    "ts3-nodejs-library": "3.5.3"
+    "ts3-nodejs-library": "3.5.1"
   },
   "name": "ts3gotify",
   "module": "src/main.ts",

src/ts3gotify.ts

@@ -1,13 +1,13 @@
 import type { Gotify } from "gotify";
 import type { Logger } from "pino";
 import type { TeamSpeak, TextMessageTargetMode } from "ts3-nodejs-library";
+import type { GotifyConfig, Mode } from "./types";
 import {
   ClientConnect,
   ClientDisconnect,
   ClientMoved,
   TextMessage,
 } from "ts3-nodejs-library/lib/types/Events";
-import type { GotifyConfig, Mode } from "./types";
 
 function resolveMessageTarget(target: TextMessageTargetMode): string {
   if (target === 1) {
@@ -43,11 +43,8 @@ export function ts3gotifyFactory(
   ts3Client: TeamSpeak,
   gotifyClient: Gotify,
   gotifyConfig: GotifyConfig,
-  logger: Logger,
-  pingInterval = 2_500
+  logger: Logger
 ) {
-  let reconnectInProgress = false;
-
   function sendNotification(message: string) {
     gotifyClient
       .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 () => {
-    await reconnectWithBackoff();
+    logger.info("disconnected, trying to reconnect...");
+    await ts3Client.reconnect(5, 1000);
+    logger.info("reconnected!");
   });
 
   ts3Client.on("error", (error: Error) => {
     logger.error(`Error connecting to TS3 server: ${error.message}`);
-    reconnectWithBackoff();
+    process.exit(1);
   });
 
   return {