Skip to content

Commit

Permalink
up
Browse files Browse the repository at this point in the history
  • Loading branch information
@achiragaming
achiragaming committed Nov 19, 2024
1 parent a295902 commit e7dfc28
Show file tree
Hide file tree
Showing 3 changed files with 56 additions and 55 deletions.
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "damonjs",
"version": "1.9.3",
"version": "1.9.4",
"preview": false,
"description": "A modified Shoukaku wrapper with enhanced queue support.",
"main": "dist/Index.js",
Expand Down
2 changes: 1 addition & 1 deletion src/Index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ export * from './DamonJs';
export { DamonJsTrack, DamonJsQueue, DamonJsPlayer, Plugins };
export * from './Modules/Interfaces';

export const version = '1.9.3';
export const version = '1.9.4';
107 changes: 54 additions & 53 deletions src/Managers/DamonJsPlayer.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,7 @@ export class DamonJsPlayer {
// Handle protective measures separately
return this.lockAction('trackEnd', async () => {
this.isTrackPlaying = false;
this.cooldowns.trackEnd = true;
const now = Date.now();
const trackEnds = this.errors.trackendSpamData.trackEnds.filter(
(time) => now - time < this.damonjs.trackEndSpam.rule.timeFrame,
Expand All @@ -201,7 +202,6 @@ export class DamonJsPlayer {
this.errors.trackendSpamData.trackEnds = trackEnds;

if (trackEnds.length >= this.damonjs.trackEndSpam.rule.maxhits) {
this.cooldowns.trackEnd = true;
destroyTriggers.push(now);
this.errors.trackendSpamData.trackEnds = [];

Expand All @@ -211,20 +211,21 @@ export class DamonJsPlayer {
}

await new Promise((resolve) => setTimeout(resolve, this.damonjs.trackEndSpam.rule.cooldown));
this.cooldowns.trackEnd = false;
}
if (this.queue.current) {
this.emit(Events.PlayerEnd, this, this.queue.current, data);
if (this.damonjs.trackEndSpam.skip) {
await this.skip();
}
}
this.cooldowns.trackEnd = false;
if (this.damonjs.trackEndSpam.skip) {
await this.skip();
}
});
}

private async handleTrackException(data: TrackExceptionEvent) {
return this.lockAction('trackException', async () => {
this.isTrackPlaying = false;
this.cooldowns.exception = true;
const now = Date.now();
const exceptions = this.errors.exceptionData.exceptions.filter(
(time) => now - time < this.damonjs.exceptions.rule.timeFrame,
Expand All @@ -237,7 +238,6 @@ export class DamonJsPlayer {
this.errors.exceptionData.exceptions = exceptions;

if (exceptions.length >= this.damonjs.exceptions.rule.maxhits) {
this.cooldowns.exception = true;
destroyTriggers.push(now);
this.errors.exceptionData.exceptions = [];

Expand All @@ -247,20 +247,21 @@ export class DamonJsPlayer {
}

await new Promise((resolve) => setTimeout(resolve, this.damonjs.exceptions.rule.cooldown));
this.cooldowns.exception = false;
}
if (this.queue.current) {
this.emit(Events.PlayerException, this, data);
if (this.damonjs.exceptions.skip) {
await this.skip();
}
}
this.cooldowns.exception = false;
if (this.damonjs.exceptions.skip) {
await this.skip();
}
});
}

private async handleTrackStuck(data: TrackStuckEvent) {
return this.lockAction('trackStuck', async () => {
this.isTrackPlaying = false;
this.cooldowns.stuck = true;
const now = Date.now();
const stucks = this.errors.stuckData.stucks.filter((time) => now - time < this.damonjs.stuck.rule.timeFrame);
const destroyTriggers = this.errors.stuckData.destroyTriggers.filter(
Expand All @@ -271,7 +272,6 @@ export class DamonJsPlayer {
this.errors.stuckData.stucks = stucks;

if (stucks.length >= this.damonjs.stuck.rule.maxhits) {
this.cooldowns.stuck = true;
destroyTriggers.push(now);
this.errors.stuckData.stucks = [];

Expand All @@ -281,14 +281,13 @@ export class DamonJsPlayer {
}

await new Promise((resolve) => setTimeout(resolve, this.damonjs.stuck.rule.cooldown));
this.cooldowns.stuck = false;
}
if (this.queue.current) {
this.emit(Events.PlayerStuck, this, data);

if (this.damonjs.stuck.skip) {
await this.skip();
}
}
this.cooldowns.stuck = false;
if (this.damonjs.stuck.skip) {
await this.skip();
}
});
}
Expand All @@ -298,6 +297,7 @@ export class DamonJsPlayer {

return this.lockAction('trackResolveError', async () => {
this.isTrackPlaying = false;
this.cooldowns.resolveError = true;
const now = Date.now();
const resolveErrors = this.errors.resolveErrorData.resolveErrors.filter(
(time) => now - time < this.damonjs.resolveError.rule.timeFrame,
Expand All @@ -310,7 +310,6 @@ export class DamonJsPlayer {
this.errors.resolveErrorData.resolveErrors = resolveErrors;

if (resolveErrors.length >= this.damonjs.resolveError.rule.maxhits) {
this.cooldowns.resolveError = true;
destroyTriggers.push(now);
this.errors.resolveErrorData.resolveErrors = [];

Expand All @@ -320,13 +319,13 @@ export class DamonJsPlayer {
}

await new Promise((resolve) => setTimeout(resolve, this.damonjs.resolveError.rule.cooldown));
this.cooldowns.resolveError = false;
}
if (this.queue.current) {
this.emit(Events.PlayerResolveError, this, current, resolveResult.message);
if (this.damonjs.resolveError.skip) {
await this.skip();
}
}
this.cooldowns.resolveError = false;
if (this.damonjs.resolveError.skip) {
await this.skip();
}
});
}
Expand Down Expand Up @@ -442,41 +441,43 @@ export class DamonJsPlayer {
* @returns {Promise<DamonJsPlayer>}
*/
public async play(tracks?: DamonJsTrack[], options?: PlayOptions): Promise<DamonJsPlayer> {
if (this.state === PlayerState.DESTROYED) throw new DamonJsError(1, 'Player is already destroyed');
if (this.isInCooldown()) throw new DamonJsError(1, 'Player is in cooldown');
if (!tracks && !this.queue.totalSize) throw new DamonJsError(1, 'No track is available to play');
if (!options || typeof options.replaceCurrent !== 'boolean') options = { ...options, replaceCurrent: false };

if (tracks) {
this.queue.splice(this.queue.currentId + 1, options.replaceCurrent && this.queue.current ? 1 : 0, ...tracks);
return this.stopTrack();
}

if (this.playable) {
this.queue.currentId--;
await this.stopTrack();
} else {
if (!this.queue.current) {
await this.handlePlayerEmpty();
throw new DamonJsError(1, 'No track is available to play');
return this.lockAction('play', async () => {
if (this.state === PlayerState.DESTROYED) throw new DamonJsError(1, 'Player is already destroyed');
if (this.isInCooldown()) throw new DamonJsError(1, 'Player is in cooldown');
if (!tracks && !this.queue.totalSize) throw new DamonJsError(1, 'No track is available to play');
if (!options || typeof options.replaceCurrent !== 'boolean') options = { ...options, replaceCurrent: false };

if (tracks) {
this.queue.splice(this.queue.currentId + 1, options.replaceCurrent && this.queue.current ? 1 : 0, ...tracks);
return this.stopTrack();
}
const current = this.queue.current;
current.setDamonJs(this.damonjs);
const resolveResult = await current.resolve({ player: this }).catch((e: Error) => e);
if (resolveResult instanceof Error) {
await this.handleResolveError(current, resolveResult);
throw new DamonJsError(1, `Player ${this.guildId} resolve error: ${resolveResult.message}`);
}
let playOptions = { track: { encoded: current.encoded, userData: current.requester ?? {} } };
if (options) playOptions = { ...playOptions, ...options };

const playerResult = await this.player.playTrack(playOptions).catch((e: Error) => e);
if (playerResult instanceof Error) {
await this.handleResolveError(current, playerResult);
throw new DamonJsError(1, `Player ${this.guildId} resolve error: ${playerResult.message}`);
if (this.playable) {
this.queue.currentId--;
await this.stopTrack();
} else {
if (!this.queue.current) {
await this.handlePlayerEmpty();
throw new DamonJsError(1, 'No track is available to play');
}
const current = this.queue.current;
current.setDamonJs(this.damonjs);
const resolveResult = await current.resolve({ player: this }).catch((e: Error) => e);
if (resolveResult instanceof Error) {
await this.handleResolveError(current, resolveResult);
throw new DamonJsError(1, `Player ${this.guildId} resolve error: ${resolveResult.message}`);
}
let playOptions = { track: { encoded: current.encoded, userData: current.requester ?? {} } };
if (options) playOptions = { ...playOptions, ...options };

const playerResult = await this.player.playTrack(playOptions).catch((e: Error) => e);
if (playerResult instanceof Error) {
await this.handleResolveError(current, playerResult);
throw new DamonJsError(1, `Player ${this.guildId} resolve error: ${playerResult.message}`);
}
}
}
return this;
return this;
});
}

/**
Expand Down

0 comments on commit e7dfc28

Please sign in to comment.