new Version

This commit is contained in:
Julian Lechner
2025-04-06 16:42:31 +02:00
parent c23ccda275
commit b8641bce5f
26 changed files with 253 additions and 314 deletions
-6
View File
@@ -1,6 +0,0 @@
import {JsonDatabaseServices} from "../InternalServices/DatabaseServices/JsonDatabaseServices";
import {MySqlDatabaseServices} from "../InternalServices/DatabaseServices/MySqlDatabaseServices";
export class Constants {
public static DatabaseServices: JsonDatabaseServices | MySqlDatabaseServices | null = null;
}
-3
View File
@@ -1,3 +0,0 @@
export interface IJsonDao {
}
-11
View File
@@ -1,11 +0,0 @@
import {IJsonDao} from "./IJsonDao";
import {Config, JsonDB} from "node-json-db";
export class JsonDao implements IJsonDao {
private _jsonDatabaseContext: JsonDB;
constructor(fileLocation: string) {
this._jsonDatabaseContext = new JsonDB(new Config(fileLocation, true, false, "/", true));
}
}
-3
View File
@@ -1,3 +0,0 @@
export interface IMySqlDao {
}
-17
View File
@@ -1,17 +0,0 @@
import {IMySqlDao} from "./IMySqlDao";
import mysql, {Connection, ConnectionOptions} from 'mysql2/promise';
import {Connection as BaseConnection} from "mysql2/typings/mysql/lib/Connection";
export class MysqlDao implements IMySqlDao {
private _mysqlDatabaseContext!: Connection;
constructor(mysqlAuthenticationData: ConnectionOptions) {
this.InitializeDatabaseContext(mysqlAuthenticationData).catch(error => {
throw new Error(error)
});
}
private async InitializeDatabaseContext(mysqlAuthenticationData: ConnectionOptions): Promise<void> {
this._mysqlDatabaseContext = await mysql.createConnection(mysqlAuthenticationData);
}
}
@@ -1,20 +0,0 @@
import {JsonDatabaseServices} from "../../InternalServices/DatabaseServices/JsonDatabaseServices";
import {MySqlDatabaseServices} from "../../InternalServices/DatabaseServices/MySqlDatabaseServices";
import {Constants} from "../../Core/Contants";
import {ConnectionOptions} from "mysql2/promise";
export class AudioStreamManager {
constructor(databaseType: "Json" | "MySql", databaseOptions: ConnectionOptions | string) {
if (databaseType === "MySql" &&
databaseOptions &&
typeof databaseOptions === "object") {
Constants.DatabaseServices = new MySqlDatabaseServices(databaseOptions);
} else if (databaseType === "Json" &&
databaseOptions &&
typeof databaseOptions === "string") {
Constants.DatabaseServices = new JsonDatabaseServices(databaseOptions);
} else {
throw new Error("Failed validating database.")
}
}
}
@@ -1,71 +0,0 @@
import {DiscordGatewayAdapterCreator, getVoiceConnection, joinVoiceChannel, VoiceConnection} from "@discordjs/voice";
import {IConnectionManager} from "./IConnectionManager";
import {Constants} from "../../Core/Contants";
class ConnectionManager implements IConnectionManager {
constructor() {
if (Constants.DatabaseServices === null) throw Error("Database services were not initialized.");
}
CreateConnection(connectionData: {
VoiceChannelId: number;
GuildId: number;
VoiceAdapter: DiscordGatewayAdapterCreator;
}): VoiceConnection {
return joinVoiceChannel({
channelId: connectionData.VoiceChannelId.toString(),
guildId: connectionData.GuildId.toString(),
adapterCreator: connectionData.VoiceAdapter
})
}
PlayAudioOnConnection(audioData: {
ResourceType: "Link" | "File";
Resource: string;
}, guildId: bigint): VoiceConnection {
throw new Error("Method not implemented.");
}
ConnectAndPlayAudio(connectionData: { VoiceChannelId: number; GuildId: number; VoiceAdapter: DiscordGatewayAdapterCreator; }, audioData: {
ResourceType: "Link" | "File";
Resource: string;
}): VoiceConnection {
throw new Error("Method not implemented.");
}
StopAudioOnConnection(guildId: bigint): VoiceConnection {
let voiceConnection = getVoiceConnection(guildId.toString());
if (!voiceConnection) throw new Error("Voice connection were not found.");
//TODO: MAKE STOP AUDIO WITHOUT DESTROYING CONNECTION
return voiceConnection;
}
DestroyConnection(guildId: bigint): void {
let voiceConnection = getVoiceConnection(guildId.toString());
if (!voiceConnection) throw new Error("Voice connection were not found.");
voiceConnection.destroy();
}
SetMaxListeners(maxListeners: number, guildId: bigint): VoiceConnection {
let voiceConnection = getVoiceConnection(guildId.toString());
if (!voiceConnection) throw new Error("Voice connection were not found.");
voiceConnection.setMaxListeners(maxListeners);
return voiceConnection;
}
SetVolume(volume: number, guildId: bigint): VoiceConnection {
if (volume < 0 || volume > 100) throw new Error("Volume must be between 0 and 100.");
let voiceConnection = getVoiceConnection(guildId.toString());
if (!voiceConnection) throw new Error("Voice connection were not found.");
//TODO: MAKE VOLUME WORK
return voiceConnection;
}
}
@@ -1,31 +0,0 @@
import {DiscordGatewayAdapterCreator, getVoiceConnection, joinVoiceChannel, VoiceConnection} from "@discordjs/voice";
export interface IConnectionManager {
CreateConnection(connectionData: {
VoiceChannelId: number;
GuildId: number;
VoiceAdapter: DiscordGatewayAdapterCreator;
}): VoiceConnection;
SetVolume(volume: number, guildId: bigint): VoiceConnection;
SetMaxListeners(maxListeners: number, guildId: bigint): VoiceConnection;
DestroyConnection(guildId: bigint): void;
StopAudioOnConnection(guildId: bigint): VoiceConnection;
ConnectAndPlayAudio(connectionData: {
VoiceChannelId: number;
GuildId: number;
VoiceAdapter: DiscordGatewayAdapterCreator;
}, audioData: {
ResourceType: "Link" | "File";
Resource: string;
}): VoiceConnection;
PlayAudioOnConnection(audioData: {
ResourceType: "Link" | "File";
Resource: string;
}, guildId: bigint): VoiceConnection;
}
@@ -1,3 +0,0 @@
export interface IDatabaseServices {
}
@@ -1,10 +0,0 @@
import {IDatabaseServices} from "./IDatabaseServices";
import {JsonDao} from "../../DataAccess/Json/JsonDao";
export class JsonDatabaseServices implements IDatabaseServices {
private _databaseDao: JsonDao;
constructor(databaseOptions : any) {
this._databaseDao = new JsonDao(databaseOptions);
}
}
@@ -1,11 +0,0 @@
import {IDatabaseServices} from "./IDatabaseServices";
import {MysqlDao} from "../../DataAccess/MySql/MysqlDao";
import {ConnectionOptions} from "mysql2/promise";
export class MySqlDatabaseServices implements IDatabaseServices {
private _databaseDao: MysqlDao;
constructor(databaseOptions: ConnectionOptions) {
this._databaseDao = new MysqlDao(databaseOptions);
}
}
-11
View File
@@ -1,11 +0,0 @@
const {getVoiceConnection} = require("@discordjs/voice");
import {maxListenerMethodOptions} from "../Utils/Options/MaxListenerMethodOptions";
export function setMaxAudioListeners({
GuildID,
MaxListeners
}: maxListenerMethodOptions) {
let audioConnection = getVoiceConnection(GuildID);
audioConnection.setMaxListeners(MaxListeners);
}
-48
View File
@@ -1,48 +0,0 @@
const {
joinVoiceChannel, createAudioPlayer, createAudioResource} = require("@discordjs/voice");
const {join} = require("node:path");
import {startMethodOptions} from "../Utils/Options/StartMethodOptions";
export function startAudio({
VoiceChannelID,
GuildID,
VoiceAdapter,
ResourceType,
Resource
}: startMethodOptions) {
let audioPlayer = createAudioPlayer();
function streamFile(file: string) {
let audioResource = createAudioResource(join(__dirname, file), {inlineVolume: true});
audioPlayer.play(audioResource);
joinVoiceChannel({
channelId: VoiceChannelID,
guildId: GuildID,
adapterCreator: VoiceAdapter
}).subscribe(audioPlayer);
}
function streamLink(link: string) {
let audioResource = createAudioResource(link);
audioPlayer.play(audioResource);
joinVoiceChannel({
channelId: VoiceChannelID,
guildId: GuildID,
adapterCreator: VoiceAdapter
}).subscribe(audioPlayer)
}
switch (ResourceType) {
case "Link":
streamLink(Resource);
break;
case "File":
streamFile(Resource);
break;
default:
throw new TypeError("Invalid audio type");
}
}
-10
View File
@@ -1,10 +0,0 @@
const {getVoiceConnection} = require("@discordjs/voice");
import {stopMethodOptions} from "../Utils/Options/StopMethodOptions";
export function stopAudio({
GuildID
}: stopMethodOptions) {
let audioConnection = getVoiceConnection(GuildID);
audioConnection.destroy();
}
+12
View File
@@ -0,0 +1,12 @@
export interface VoiceAudioDataModel {
/**
* The unique identifier for the audio resource.
*/
ResourceType: "Link" | "File";
/**
* The URL or file path of the audio resource.
* any is to be assumed to require(filepath)
*/
Resource: string | any;
}
+19
View File
@@ -0,0 +1,19 @@
import {DiscordGatewayAdapterCreator} from "@discordjs/voice";
export interface VoiceConnectionDataModel {
/**
* The ID of the voice channel to connect to.
*/
VoiceChannelId: number;
/**
* The Id of the guild (server) to connect to.
*/
GuildId: number;
/**
* The adapter creator for the voice connection.
* Can be archived by the guild instance via the voiceAdapterCreator property.
*/
VoiceAdapter: DiscordGatewayAdapterCreator;
}
+138
View File
@@ -0,0 +1,138 @@
import {
AudioPlayer,
AudioResource,
createAudioPlayer,
createAudioResource,
joinVoiceChannel,
VoiceConnection
} from "@discordjs/voice";
import {IAudioManager} from "./IAudioManager";
import {VoiceConnectionDataModel} from "../../Models/VoiceConnectionDataModel";
import {VoiceAudioDataModel} from "../../Models/VoiceAudioDataModel";
import {join} from "node:path";
export class AudioManager implements IAudioManager {
public VoiceConnection: VoiceConnection | null = null;
public AudioPlayer: AudioPlayer | null = null;
public AudioResource: AudioResource | null = null;
public IsActive: boolean = false;
public IsAudioPlaying: boolean = false;
public ConnectionData: VoiceConnectionDataModel | null;
public AudioData: VoiceAudioDataModel | null;
constructor(connectionData: VoiceConnectionDataModel | null = null, audioData: VoiceAudioDataModel | null = null) {
this.ConnectionData = connectionData;
this.AudioData = audioData;
}
OverrideOptions(connectionData: VoiceConnectionDataModel | null = null, audioData: VoiceAudioDataModel | null = null): void {
this.ConnectionData = connectionData;
this.AudioData = audioData;
}
public CreateConnection(isRenew: boolean = false): void {
this.CheckIfNull(this.ConnectionData);
if (!isRenew) {
if (this.IsActive) {
this.DestroyConnection(false);
} else {
this.IsActive = true;
}
}
this.VoiceConnection = joinVoiceChannel({
channelId: this.ConnectionData!.VoiceChannelId.toString(),
guildId: this.ConnectionData!.GuildId.toString(),
adapterCreator: this.ConnectionData!.VoiceAdapter
});
setTimeout((): void => {
this.RenewConnectionAndAudio();
}, 5400000);
}
public PlayAudioOnConnection(): void {
this.CheckIfNull(this.AudioData);
if (this.AudioData!.ResourceType === "File") {
this.AudioResource = createAudioResource(join(__dirname, this.AudioData!.Resource), {inlineVolume: true});
} else if (this.AudioData!.ResourceType === "Link") {
this.AudioResource = createAudioResource(this.AudioData!.Resource, {inlineVolume: true});
} else {
throw new Error("Invalid resource type.");
}
this.AudioPlayer = createAudioPlayer();
this.AudioPlayer.play(this.AudioResource);
this.VoiceConnection!.subscribe(this.AudioPlayer!);
this.IsAudioPlaying = true;
}
public StopAudioOnConnection(): void {
if (this.IsAudioPlaying) {
this.DestroyConnection(false)
this.CreateConnection();
} else {
throw new Error("Audio is not playing.");
}
}
public PauseAudio(): void {
this.CheckIfNull(this.AudioPlayer);
this.AudioPlayer!.pause();
}
public ResumeAudio(): void {
this.CheckIfNull(this.AudioPlayer);
this.AudioPlayer!.unpause();
}
public CreateConnectionAndPlayAudio(): void {
this.CreateConnection();
this.PlayAudioOnConnection();
}
public DestroyConnection(resetValidationParameters: boolean = true): void {
this.CheckIfNull(this.VoiceConnection);
this.VoiceConnection!.destroy();
if (resetValidationParameters) {
this.IsActive = false;
this.IsAudioPlaying = false;
}
}
public SetMaxListeners(maxListeners: number): void {
this.CheckIfNull(this.VoiceConnection);
this.VoiceConnection!.setMaxListeners(maxListeners);
}
public SetVolume(volumeInPercent: number): void {
if (volumeInPercent < 0 || volumeInPercent > 100) throw new Error("Volume must be between 0 and 100.");
this.AudioResource!.volume!.setVolume(volumeInPercent / 100);
}
private RenewConnectionAndAudio(): void {
this.DestroyConnection(false);
if (this.IsActive) {
this.CreateConnection(true);
if (this.IsAudioPlaying) {
this.PlayAudioOnConnection();
}
}
}
private CheckIfNull<T>(value: T | null): boolean {
if (value === null) {
throw new Error(`${value} cannot be null in this case.`);
}
return true;
}
}
@@ -0,0 +1,25 @@
import {VoiceConnection} from "@discordjs/voice";
import {VoiceAudioDataModel} from "../../Models/VoiceAudioDataModel";
import {VoiceConnectionDataModel} from "../../Models/VoiceConnectionDataModel";
export interface IAudioManager {
OverrideOptions(connectionData?: VoiceConnectionDataModel | null, audioData?: VoiceAudioDataModel | null): void;
CreateConnection(isRenew: boolean): void;
PlayAudioOnConnection(): void;
PauseAudio(): void;
ResumeAudio(): void;
StopAudioOnConnection(): void;
CreateConnectionAndPlayAudio(): void;
DestroyConnection(resetValidationParameters: boolean): void;
SetVolume(volumeInPercent: number): void;
SetMaxListeners(maxListeners: number): void;
}
@@ -1,4 +0,0 @@
export type maxListenerMethodOptions = {
GuildID: number;
MaxListeners: number;
};
-7
View File
@@ -1,7 +0,0 @@
export type startMethodOptions = {
VoiceChannelID: number;
GuildID: number;
VoiceAdapter: number;
ResourceType: "Link" | "File";
Resource: string;
};
-3
View File
@@ -1,3 +0,0 @@
export type stopMethodOptions = {
GuildID: number;
};
+3 -1
View File
@@ -1 +1,3 @@
export { AudioStreamManager } from "./ExternalServices/AudioStreamManager/AudioStreamManager";
export {AudioManager} from "./Services/AudioManager/AudioManager";
export type {VoiceConnectionDataModel} from "./Models/VoiceConnectionDataModel";
export type {VoiceAudioDataModel} from "./Models/VoiceAudioDataModel";