Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 0e4ab1bfc6 | |||
| 0670e54cf1 | |||
| 494c71d4c7 | |||
| 74dd61ee7f | |||
| 07d97b967c | |||
| 62578f2990 | |||
| 90299966b0 |
@@ -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@d08e5c354a6adb9ed34480a06d141179aa583294 # v7.0.0
|
||||
uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f # v7.1.0
|
||||
with:
|
||||
context: .
|
||||
file: ./Dockerfile
|
||||
@@ -89,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@11c694022eefab5876ac346fc9ffc0464b2548c7 # 0.1.30
|
||||
- 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@f386e2570df6a796ba0a69865c89ea0c1a7109ab # 0.2.2
|
||||
- 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
|
||||
|
||||
+2
-2
@@ -10,7 +10,7 @@
|
||||
"@typescript-eslint/parser": "5.62.0",
|
||||
"cspell": "10.0.0",
|
||||
"eslint": "8.57.1",
|
||||
"typescript": "6.0.2",
|
||||
"typescript": "6.0.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.1"
|
||||
"ts3-nodejs-library": "3.5.2"
|
||||
},
|
||||
"name": "ts3gotify",
|
||||
"module": "src/main.ts",
|
||||
|
||||
+23
-4
@@ -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) {
|
||||
@@ -45,6 +45,8 @@ export function ts3gotifyFactory(
|
||||
gotifyConfig: GotifyConfig,
|
||||
logger: Logger
|
||||
) {
|
||||
let reconnectInProgress = false;
|
||||
|
||||
function sendNotification(message: string) {
|
||||
gotifyClient
|
||||
.send({
|
||||
@@ -87,15 +89,32 @@ export function ts3gotifyFactory(
|
||||
}
|
||||
}
|
||||
|
||||
ts3Client.on("close", async () => {
|
||||
async function reconnectWithBackoff() {
|
||||
if (reconnectInProgress) {
|
||||
return;
|
||||
}
|
||||
|
||||
reconnectInProgress = true;
|
||||
logger.info("disconnected, trying to reconnect...");
|
||||
await ts3Client.reconnect(5, 1000);
|
||||
|
||||
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;
|
||||
}
|
||||
}
|
||||
|
||||
ts3Client.on("close", async () => {
|
||||
await reconnectWithBackoff();
|
||||
});
|
||||
|
||||
ts3Client.on("error", (error: Error) => {
|
||||
logger.error(`Error connecting to TS3 server: ${error.message}`);
|
||||
process.exit(1);
|
||||
reconnectWithBackoff();
|
||||
});
|
||||
|
||||
return {
|
||||
|
||||
Reference in New Issue
Block a user