chore(deps): update oven/bun docker tag to v1.2.11

.bun-version

@@ -1 +1 @@
-1.3.6
+1.2.11

.dockerignore

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

.gitea/workflows/cd.yaml

@@ -4,27 +4,41 @@ on:
   push:
     branches:
       - main
-    paths:
-      - src/**
-      - .bun-version
-      - package.json
-      - tsconfig.json
-      - Dockerfile
-      - bun.lockb
-  workflow_dispatch:
 
 env:
   DOCKER_REGISTRY: gitea.t000-n.de
 
 jobs:
+  check-changes:
+    name: Check changes
+    runs-on: ubuntu-latest
+    outputs:
+      changes: ${{ steps.filter.outputs.code }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Get changed files
+        id: filter
+        uses: dorny/paths-filter@v3
+        with:
+          filters: |
+            code:
+              - 'src/**'
+              - '.bun-version'
+              - 'package.json'
+              - 'tsconfig.json'
+              - 'Dockerfile'
+              - 'bun.lockb'
+
   test:
     name: Test
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@v4
 
-      - uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0
+      - uses: oven-sh/setup-bun@v2
         with:
           bun-version-file: ".bun-version"
 
@@ -44,18 +58,20 @@ jobs:
         arch: [amd64, arm64]
     needs:
       - test
+      - check-changes
     runs-on:
       - ubuntu-latest
       - linux_${{ matrix.arch }}
+    if: ${{ needs.check-changes.outputs.changes == 'true' }}
     steps:
       - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@v4
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4
+        uses: docker/setup-buildx-action@v3
 
       - name: Login to Registry
-        uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
+        uses: docker/login-action@v3
         with:
           registry: ${{ env.DOCKER_REGISTRY }}
           username: ${{ secrets.REGISTRY_USER }}
@@ -68,7 +84,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@v6
         with:
           context: .
           file: ./Dockerfile
@@ -76,40 +92,16 @@ jobs:
           push: true
           provenance: false
           tags: |
-            ${{ env.DOCKER_REGISTRY }}/t.behrendt/${{ steps.meta.outputs.REPO_NAME }}:${{ steps.meta.outputs.REPO_VERSION }}-${{ matrix.arch }}
-
-  create_tag:
-    name: Create tag
-    needs:
-      - test
-    runs-on: ubuntu-latest
-    outputs:
-      tag: ${{ steps.tag.outputs.new-tag }}
-    steps:
-      - 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
-        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@47a1c635cfc76cfb4eeee3db0d0b89bf19007c7a # 0.2.3
-        with:
-          tag: ${{ steps.tag.outputs.new-tag }}
-      - name: Set output
-        run: |
-          echo "tag=${{ steps.tag.outputs.new-tag }}" >> $GITHUB_OUTPUT
+            ${{ env.DOCKER_REGISTRY }}/t00n/${{ steps.meta.outputs.REPO_NAME }}:${{ steps.meta.outputs.REPO_VERSION }}-${{ matrix.arch }}
 
   create_manifest:
     name: Create manifest
     needs:
       - build_and_push
-      - create_tag
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@v4
 
       - name: Get Metadata
         id: meta
@@ -118,7 +110,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@v3
         with:
           registry: ${{ env.DOCKER_REGISTRY }}
           username: ${{ secrets.REGISTRY_USER }}
@@ -126,8 +118,8 @@ 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 }}-arm64
+          docker manifest create ${{ env.DOCKER_REGISTRY }}/t00n/${{ steps.meta.outputs.REPO_NAME }}:latest \
+            ${{ env.DOCKER_REGISTRY }}/t00n/${{ steps.meta.outputs.REPO_NAME }}:${{ steps.meta.outputs.REPO_VERSION }}-amd64 \
+            ${{ env.DOCKER_REGISTRY }}/t00n/${{ 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 }}
+          docker manifest push ${{ env.DOCKER_REGISTRY }}/t00n/${{ steps.meta.outputs.REPO_NAME }}:latest

.gitea/workflows/ci.yaml

@@ -9,9 +9,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@v4
 
-      - uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0
+      - uses: oven-sh/setup-bun@v2
         with:
           bun-version-file: ".bun-version"
 

.gitignore

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

Dockerfile

@@ -1,4 +1,4 @@
-FROM docker.io/oven/bun:1.3.6@sha256:f20d9cf365ab35529384f1717687c739c92e6f39157a35a95ef06f4049a10e4a AS base
+FROM oven/bun:1.2.11 AS base
 
 WORKDIR /app
 

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
-    ports:
-      - 8080:80
-    environment:
-      TZ: "Europe/Amsterdam"
-      GOTIFY_DEFAULTUSER_PASS: "admin"
-    volumes:
-      - "./gotify_data:/app/data"
-
-  ts3:
-    image: docker.io/library/teamspeak:latest
-    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,19 +6,20 @@
     "start": "bun run src/main.ts"
   },
   "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "5.62.0",
-    "@typescript-eslint/parser": "5.62.0",
-    "cspell": "10.0.0",
-    "eslint": "8.57.1",
-    "typescript": "6.0.3",
+    "@types/ts3-nodejs-library": "^2.0.1",
+    "@typescript-eslint/eslint-plugin": "^5.46.0",
+    "@typescript-eslint/parser": "^5.46.0",
+    "cspell": "^8.0.0",
+    "eslint": "^8.29.0",
+    "typescript": "^5.0.0",
     "@types/bun": "latest"
   },
   "dependencies": {
-    "env-var": "7.5.0",
-    "gotify": "1.1.0",
-    "pino": "10.3.1",
-    "pino-pretty": "13.1.3",
-    "ts3-nodejs-library": "3.5.2"
+    "env-var": "^7.5.0",
+    "gotify": "^1.1.0",
+    "pino": "^9.6.0",
+    "pino-pretty": "^13.0.0",
+    "ts3-nodejs-library": "^3.4.1"
   },
   "name": "ts3gotify",
   "module": "src/main.ts",

renovate.json

@@ -1,13 +1,3 @@
 {
-  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": [
-    "local>t.behrendt/renovate-configs:common",
-    "local>t.behrendt/renovate-configs:action"
-  ],
-  "packageRules": [
-    {
-      "matchPackageNames": ["Bun", "oven/bun"],
-      "groupName": "bun version"
-    }
-  ]
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json"
 }

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 {