Compare commits
18 Commits
0.0.11
...
981c64d1b0
| Author | SHA1 | Date | |
|---|---|---|---|
|
981c64d1b0
|
|||
|
9b639f240e
|
|||
|
150aa67971
|
|||
| f6834a1d2c | |||
| 4b1e738020 | |||
| 2b3a93d6b2 | |||
| d6d9c63b3d | |||
| eb9b335789 | |||
| 0e4ab1bfc6 | |||
| 0670e54cf1 | |||
| 494c71d4c7 | |||
| 74dd61ee7f | |||
| 07d97b967c | |||
| 62578f2990 | |||
| 90299966b0 | |||
| 0ceb5d966d | |||
| 1addbe9276 | |||
| 27e28edc71 |
@@ -0,0 +1,6 @@
|
|||||||
|
*
|
||||||
|
|
||||||
|
!package.json
|
||||||
|
!bun.lockb
|
||||||
|
!src/
|
||||||
|
!tsconfig.json
|
||||||
@@ -41,7 +41,7 @@ jobs:
|
|||||||
name: Build and push
|
name: Build and push
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
arch: [ amd64, arm64 ]
|
arch: [amd64]
|
||||||
needs:
|
needs:
|
||||||
- test
|
- test
|
||||||
runs-on:
|
runs-on:
|
||||||
@@ -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@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
|
uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.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@d08e5c354a6adb9ed34480a06d141179aa583294 # v7.0.0
|
uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f # v7.1.0
|
||||||
with:
|
with:
|
||||||
context: .
|
context: .
|
||||||
file: ./Dockerfile
|
file: ./Dockerfile
|
||||||
@@ -77,6 +77,8 @@ jobs:
|
|||||||
provenance: false
|
provenance: false
|
||||||
tags: |
|
tags: |
|
||||||
${{ env.DOCKER_REGISTRY }}/t.behrendt/${{ steps.meta.outputs.REPO_NAME }}:${{ steps.meta.outputs.REPO_VERSION }}-${{ matrix.arch }}
|
${{ 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:
|
create_tag:
|
||||||
name: Create tag
|
name: Create tag
|
||||||
@@ -89,12 +91,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@11c694022eefab5876ac346fc9ffc0464b2548c7 # 0.1.30
|
- uses: https://gitea.t000-n.de/t.behrendt/conventional-semantic-git-tag-increment@ef0c23189db33220a73022d8c29a27709d0df440 # 0.1.32
|
||||||
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@f386e2570df6a796ba0a69865c89ea0c1a7109ab # 0.2.2
|
- uses: https://gitea.t000-n.de/t.behrendt/actions/release-git-tag@38c1bbd8bad3e7965744d03de85faa4a5b808d1b # 0.2.4
|
||||||
with:
|
with:
|
||||||
tag: ${{ steps.tag.outputs.new-tag }}
|
tag: ${{ steps.tag.outputs.new-tag }}
|
||||||
- name: Set output
|
- name: Set output
|
||||||
@@ -118,7 +120,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@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
|
uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
|
||||||
with:
|
with:
|
||||||
registry: ${{ env.DOCKER_REGISTRY }}
|
registry: ${{ env.DOCKER_REGISTRY }}
|
||||||
username: ${{ secrets.REGISTRY_USER }}
|
username: ${{ secrets.REGISTRY_USER }}
|
||||||
@@ -127,7 +129,6 @@ jobs:
|
|||||||
- name: Create manifest
|
- name: Create manifest
|
||||||
run: |
|
run: |
|
||||||
docker manifest create ${{ env.DOCKER_REGISTRY }}/t.behrendt/${{ steps.meta.outputs.REPO_NAME }}:${{ needs.create_tag.outputs.tag }} \
|
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 }}
|
docker manifest push ${{ env.DOCKER_REGISTRY }}/t.behrendt/${{ steps.meta.outputs.REPO_NAME }}:${{ needs.create_tag.outputs.tag }}
|
||||||
|
|||||||
@@ -15,7 +15,16 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
bun-version-file: ".bun-version"
|
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
|
- name: Install dependencies
|
||||||
|
if: steps.cache-deps.outputs.cache-hit != 'true'
|
||||||
run: bun install --frozen-lockfile
|
run: bun install --frozen-lockfile
|
||||||
|
|
||||||
- name: Run lint
|
- name: Run lint
|
||||||
|
|||||||
@@ -130,3 +130,6 @@ dist
|
|||||||
.yarn/install-state.gz
|
.yarn/install-state.gz
|
||||||
.pnp.*
|
.pnp.*
|
||||||
|
|
||||||
|
# Local docker test setup
|
||||||
|
gotify_data/
|
||||||
|
ts3_data/
|
||||||
|
|||||||
@@ -0,0 +1,47 @@
|
|||||||
|
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
@@ -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": "9.7.0",
|
"cspell": "10.0.0",
|
||||||
"eslint": "8.57.1",
|
"eslint": "8.57.1",
|
||||||
"typescript": "5.9.3",
|
"typescript": "6.0.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.1"
|
"ts3-nodejs-library": "3.5.3"
|
||||||
},
|
},
|
||||||
"name": "ts3gotify",
|
"name": "ts3gotify",
|
||||||
"module": "src/main.ts",
|
"module": "src/main.ts",
|
||||||
|
|||||||
+27
-5
@@ -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,8 +43,11 @@ 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({
|
||||||
@@ -87,15 +90,34 @@ export function ts3gotifyFactory(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ts3Client.on("close", async () => {
|
async function reconnectWithBackoff() {
|
||||||
|
if (reconnectInProgress) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
reconnectInProgress = true;
|
||||||
logger.info("disconnected, trying to reconnect...");
|
logger.info("disconnected, trying to reconnect...");
|
||||||
await ts3Client.reconnect(5, 1000);
|
|
||||||
|
try {
|
||||||
|
await ts3Client.reconnect(10, 2000);
|
||||||
logger.info("reconnected!");
|
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();
|
||||||
});
|
});
|
||||||
|
|
||||||
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}`);
|
||||||
process.exit(1);
|
reconnectWithBackoff();
|
||||||
});
|
});
|
||||||
|
|
||||||
return {
|
return {
|
||||||
|
|||||||
Reference in New Issue
Block a user