Compare commits
14 Commits
99cc6c4e7b
..
0.0.16
| Author | SHA1 | Date | |
|---|---|---|---|
| 0e4ab1bfc6 | |||
| 0670e54cf1 | |||
| 494c71d4c7 | |||
| 74dd61ee7f | |||
| 07d97b967c | |||
| 62578f2990 | |||
| 90299966b0 | |||
| 0ceb5d966d | |||
| 1addbe9276 | |||
| 27e28edc71 | |||
| e81533c132 | |||
| d1b783eed5 | |||
| 31cb35b8eb | |||
| edb3d01d4f |
@@ -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
|
||||||
@@ -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@41b7e04221df8a033bec841d40a097b76e5f67ff # 0.1.29
|
- 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@3925c92fc33f3d2bc87d28d21ab691b7e6dd6cdf # 0.2.1
|
- uses: https://gitea.t000-n.de/t.behrendt/actions/release-git-tag@47a1c635cfc76cfb4eeee3db0d0b89bf19007c7a # 0.2.3
|
||||||
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@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 }}
|
||||||
|
|||||||
+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": "8.19.4",
|
"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.2"
|
||||||
},
|
},
|
||||||
"name": "ts3gotify",
|
"name": "ts3gotify",
|
||||||
"module": "src/main.ts",
|
"module": "src/main.ts",
|
||||||
|
|||||||
+24
-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) {
|
||||||
@@ -45,6 +45,8 @@ export function ts3gotifyFactory(
|
|||||||
gotifyConfig: GotifyConfig,
|
gotifyConfig: GotifyConfig,
|
||||||
logger: Logger
|
logger: Logger
|
||||||
) {
|
) {
|
||||||
|
let reconnectInProgress = false;
|
||||||
|
|
||||||
function sendNotification(message: string) {
|
function sendNotification(message: string) {
|
||||||
gotifyClient
|
gotifyClient
|
||||||
.send({
|
.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...");
|
logger.info("disconnected, trying to reconnect...");
|
||||||
await ts3Client.reconnect(5, 1000);
|
|
||||||
logger.info("reconnected!");
|
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) => {
|
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