Compare commits
25
Commits
v0.7.3501519
...
v1.1.30
| Author | SHA1 | Date | |
|---|---|---|---|
 fraujulian
|
9f4f70dcc0 | ||
|
fraujulian
|
907985b54e | ||
|
fraujulian
|
9998447c65 | ||
|
fraujulian
|
e8fba67a1a | ||
|
fraujulian
|
b34afa0d8b | ||
|
fraujulian
|
7f2eeaefb0 | ||
|
fraujulian
|
0fd3a41f1c | ||
|
fraujulian
|
51d738a442 | ||
|
fraujulian
|
db7de9c04d | ||
|
fraujulian
|
eaf86f948b | ||
|
fraujulian
|
d4f92e1eac | ||
|
fraujulian
|
9eace0838b | ||
|
fraujulian
|
5cc7127a5a | ||
|
fraujulian
|
7923b917d8 | ||
|
fraujulian
|
78cbf3f233 | ||
|
fraujulian
|
4cc9774ff5 | ||
|
fraujulian
|
6962d87f24 | ||
 fraujulianandGitHub
|
966db49e37 | ||
|
fraujulianandGitHub
|
707822e43d | ||
|
fraujulianandGitHub
|
29f51c5ff0 | ||
|
dependabot[bot]andGitHub
|
ee676212ab | ||
|
dependabot[bot]andGitHub
|
5496514dab | ||
|
fraujulianandGitHub
|
1e08cddc61 | ||
|
dependabot[bot]andGitHub
|
d07efd73a5 | ||
|
fraujulianandGitHub
|
4447437fd2 |
@@ -4,8 +4,11 @@ on:
|
||||
workflow_dispatch:
|
||||
|
||||
permissions:
|
||||
id-token: write
|
||||
contents: read
|
||||
contents: write
|
||||
|
||||
env:
|
||||
VERSION_MAJOR: '1'
|
||||
VERSION_MINOR: '1'
|
||||
|
||||
jobs:
|
||||
build:
|
||||
@@ -14,26 +17,75 @@ jobs:
|
||||
steps:
|
||||
- name: Checkout Repository
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: use NodeJS v22.12.0
|
||||
uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: '22.12.0'
|
||||
registry-url: 'https://registry.npmjs.org'
|
||||
always-auth: true
|
||||
fetch-depth: 0
|
||||
fetch-tags: true
|
||||
|
||||
- name: Create .npmrc
|
||||
run: echo "//registry.npmjs.org/:_authToken=\${NPM_TOKEN}" > ~/.npmrc
|
||||
env:
|
||||
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
|
||||
- name: Use NodeJS v22.22.3
|
||||
uses: actions/setup-node@v6
|
||||
with:
|
||||
node-version: '22.22.3'
|
||||
registry-url: 'https://registry.npmjs.org'
|
||||
package-manager-cache: false
|
||||
|
||||
- name: Install Dependencies
|
||||
run: npm install
|
||||
run: npm ci
|
||||
|
||||
- name: run Rollout Build
|
||||
- name: Set Release Version
|
||||
id: version
|
||||
run: npm run version:place
|
||||
|
||||
- name: Export Release Version
|
||||
id: release_version
|
||||
run: |
|
||||
package_version="$(node -p "require('./package.json').version")"
|
||||
echo "tag=${package_version}" >> "$GITHUB_OUTPUT"
|
||||
|
||||
- name: Run Build
|
||||
run: npm run build
|
||||
|
||||
- name: Publish Library
|
||||
run: npm publish
|
||||
run: npm publish --access public
|
||||
env:
|
||||
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
|
||||
|
||||
- name: Create GitHub release
|
||||
env:
|
||||
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
RELEASE_TAG: v${{ steps.release_version.outputs.tag }}
|
||||
run: |
|
||||
git fetch --force --tags
|
||||
|
||||
previous_tag="$(gh api repos/${{ github.repository }}/releases --paginate --jq '.[] | select(.draft == false) | .tag_name' | grep -Fxv "$RELEASE_TAG" | head -n 1 || true)"
|
||||
|
||||
if [ -n "$previous_tag" ]; then
|
||||
if git rev-parse --verify --quiet "${previous_tag}^{commit}" >/dev/null; then
|
||||
commit_messages="$(git log --reverse --format='- %s' "${previous_tag}..${GITHUB_SHA}")"
|
||||
else
|
||||
commit_messages="$(git log --reverse --format='- %s' "${GITHUB_SHA}")"
|
||||
fi
|
||||
full_changelog="https://github.com/${{ github.repository }}/compare/${previous_tag}...${RELEASE_TAG}"
|
||||
else
|
||||
commit_messages="$(git log --reverse --format='- %s' "${GITHUB_SHA}")"
|
||||
full_changelog=""
|
||||
fi
|
||||
|
||||
if [ -z "$commit_messages" ]; then
|
||||
commit_messages='- No commits since the previous release'
|
||||
fi
|
||||
|
||||
{
|
||||
echo '## Changes'
|
||||
echo
|
||||
printf '%s\n' "$commit_messages"
|
||||
echo
|
||||
if [ -n "$full_changelog" ]; then
|
||||
echo "**Full Changelog**: ${full_changelog}"
|
||||
fi
|
||||
} > release-notes.md
|
||||
|
||||
if gh release view "$RELEASE_TAG" >/dev/null 2>&1; then
|
||||
gh release edit "$RELEASE_TAG" --title "$RELEASE_TAG" --notes-file release-notes.md
|
||||
else
|
||||
gh release create "$RELEASE_TAG" --target "${GITHUB_SHA}" --title "$RELEASE_TAG" --notes-file release-notes.md
|
||||
fi
|
||||
|
||||
@@ -2,6 +2,9 @@ name: Build Validation
|
||||
|
||||
on:
|
||||
workflow_dispatch:
|
||||
push:
|
||||
branches:
|
||||
- main
|
||||
pull_request:
|
||||
types: [opened, synchronize, reopened]
|
||||
|
||||
@@ -12,13 +15,16 @@ jobs:
|
||||
- name: Checkout Repository
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: use NodeJS v22.16.0
|
||||
- name: use NodeJS v22.22.3
|
||||
uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: '22.16.0'
|
||||
node-version: '22.22.3'
|
||||
|
||||
- name: Install Dependencies
|
||||
run: npm install
|
||||
run: npm ci
|
||||
|
||||
- name: run Rollout Build
|
||||
- name: Run Checks
|
||||
run: npm run check
|
||||
|
||||
- name: Run Build
|
||||
run: npm run build
|
||||
|
||||
+13
-4
@@ -1,4 +1,13 @@
|
||||
.idea
|
||||
.git
|
||||
node_modules
|
||||
dist
|
||||
.idea/
|
||||
.vscode/
|
||||
node_modules/
|
||||
dist/
|
||||
coverage/
|
||||
|
||||
.npm/
|
||||
.eslintcache
|
||||
*.log
|
||||
*.tsbuildinfo
|
||||
|
||||
.DS_Store
|
||||
Thumbs.db
|
||||
|
||||
+1
-2
@@ -1,3 +1,2 @@
|
||||
#!/usr/bin/env sh
|
||||
npm run format:check || exit 1
|
||||
npm run lint || exit 1
|
||||
npm run check || exit 1
|
||||
|
||||
+5
-1
@@ -6,6 +6,8 @@
|
||||
|
||||
dist
|
||||
node_modules
|
||||
coverage
|
||||
.npm
|
||||
|
||||
.husky
|
||||
src
|
||||
@@ -24,6 +26,8 @@ CODEOWNERS
|
||||
tsconfig.json
|
||||
tsconfig.eslint.json
|
||||
tsup.config.ts
|
||||
eslint.config.js
|
||||
eslint.config.cjs
|
||||
eslint.config.typeaware.cjs
|
||||
package-lock.json
|
||||
jest.config.cjs
|
||||
tests
|
||||
|
||||
+9
-5
@@ -1,5 +1,9 @@
|
||||
node_modules
|
||||
dist
|
||||
.git
|
||||
.idea
|
||||
.vscode
|
||||
node_modules/
|
||||
dist/
|
||||
coverage/
|
||||
|
||||
.git/
|
||||
.idea/
|
||||
.vscode/
|
||||
|
||||
package-lock.json
|
||||
|
||||
+1
-1
@@ -9,5 +9,5 @@
|
||||
"bracketSpacing": true,
|
||||
"bracketSameLine": false,
|
||||
"quoteProps": "as-needed",
|
||||
"endOfLine": "crlf"
|
||||
"endOfLine": "auto"
|
||||
}
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
FrauJulian
|
||||
@@ -1,129 +1,225 @@
|
||||
# Discord Audio Stream
|
||||
|
||||
[](http://npmjs.org/package/discord-audio-stream)
|
||||
|
||||
|
||||
|
||||
|
||||
**This module is designed to work with [discord.js/voice](https://www.npmjs.com/package/@discordjs/voice) v0.19. This
|
||||
package doesn't support older
|
||||
versions!**
|
||||
> **Designed for 24/7 Discord audio playback.**
|
||||
> `discord-audio-stream` is a small TypeScript library for managed Discord voice playback through
|
||||
> `@discordjs/voice` and ffmpeg.
|
||||
|
||||
> **Designed for 24/7 audio playing on discord.**
|
||||
> Discord has many unwanted rate limits, especially in the audio area. This package does all the work and ensures that
|
||||
> your music never stops playing due to ffmpeg or Discord, with as little effort as possible.
|
||||
Discord voice streams need careful lifecycle handling. This package manages the voice connection, ffmpeg process,
|
||||
raw PCM resource creation, optional reconnect renewal, and predictable cleanup so your bot code stays small and readable.
|
||||
|
||||
> **Recommended best Practise:**
|
||||
> Create a global Map<GuildId, AudioManager> (Map<KEY, OBJ>) list. When the feature is used on a guild, add a new
|
||||
> instance of AudioManager to the Map. When starting the connection or audio, overwrite the respective configuration with
|
||||
> the override methods provided. To finally start, use the respective method. For each call and each change, retrieve the
|
||||
> AudioManager object from the list and perform your actions. When the feature get stopped, first execute StopConnection
|
||||
> and then Dispose to save as much power as possible. Garbage collection does the rest.
|
||||
> **For large systems:** For large systems, it is recommended to queue each start with the
|
||||
> packet [p-queue](https://www.npmjs.com/package/p-queue), to give ffmpeg enough time..
|
||||
> **Recommended best practice:**
|
||||
> Keep one `AudioManager` per guild, usually in a `Map<string, AudioManager>`. Update the connection or source through
|
||||
> `setConnection()` and `setSource()`, then call `start()`. When playback stops, call `stop()`. When the manager will not
|
||||
> be reused, call `dispose()` to release timers, streams, ffmpeg, and the voice connection.
|
||||
|
||||
> **For large bots:**
|
||||
> Queue many simultaneous starts, for example with [`p-queue`](https://www.npmjs.com/package/p-queue), so the host does
|
||||
> not spawn too many ffmpeg processes in the same tick.
|
||||
|
||||
## 👋 Support
|
||||
|
||||
Please create an [issue](https://github.com/FrauJulian/DiscordAudioStreamNPM/issues) on github or write [
|
||||
`fraujulian`](https://discord.com/users/860206216893693973) on discord!
|
||||
Please create an [issue](https://github.com/FrauJulian/Discord-Audio-Stream/issues) on GitHub or contact
|
||||
[`fraujulian`](https://discord.com/users/860206216893693973) on Discord.
|
||||
|
||||
## 📝 Usage
|
||||
|
||||
### Installation
|
||||
|
||||
**Node.js 22.12.0 or newer is required.**
|
||||
**Node.js `22.22.3` or newer is required.**
|
||||
|
||||
Install the library and the required voice packages:
|
||||
|
||||
```bash
|
||||
npm install discord-audio-stream
|
||||
yarn add discord-audio-stream
|
||||
pnpm add discord-audio-stream
|
||||
bun add discord-audio-stream
|
||||
npm install discord-audio-stream @discordjs/voice prism-media @snazzah/davey opusscript
|
||||
```
|
||||
|
||||
#### Required Dependencies
|
||||
`libsodium-wrappers` is optional. Install it only when your runtime does not support `aes-256-gcm`:
|
||||
|
||||
- > You only need to install `libsodium-wrappers` if your system does not support `aes-256-gcm` (verify by running
|
||||
> `require('node:crypto').getCiphers().includes('aes-256-gcm')`).
|
||||
- `@snazzah/davey`
|
||||
- `opusscript`
|
||||
- `prism-media`
|
||||
- **FFmpeg** (one of those)
|
||||
- [`FFmpeg`](https://ffmpeg.org/) (installed and added to environment)
|
||||
- `ffmpeg-static`
|
||||
|
||||
### AudioManager Instance
|
||||
|
||||
#### Options
|
||||
|
||||
**Declaration:**
|
||||
|
||||
```
|
||||
AudioManager(ffmpegMode: string, renewInMs, number, connectionData: VoiceConnectionDataModel, audioData: VoiceAudioDataModel): IDisposable, IAudioManager
|
||||
```bash
|
||||
node -e "console.log(require('node:crypto').getCiphers().includes('aes-256-gcm'))"
|
||||
npm install libsodium-wrappers
|
||||
```
|
||||
|
||||
- `ffmpegMode`: 'Native' or 'Standalone'
|
||||
- Native: [`FFmpeg`](https://ffmpeg.org/) installed on your system
|
||||
- Standalone: FFmpeg-static as NodeJs library
|
||||
- `renewInMs`: renewal time > default is 1,5h (5400000ms)
|
||||
- `connectionData`: Options for voice connection. (type of **VoiceConnectionDataModel**)
|
||||
- `audioData`: Options for audio player. (type of **VoiceAudioDataModel**)
|
||||
For bundled ffmpeg support, install `ffmpeg-static` and use `ffmpeg.mode: 'static'`:
|
||||
|
||||
#### Example
|
||||
```bash
|
||||
npm install ffmpeg-static
|
||||
```
|
||||
|
||||
```js
|
||||
let audioManager = new AudioManager(
|
||||
'Native',
|
||||
5400000,
|
||||
{
|
||||
VoiceChannelId: 0, //voice channel id where to play music
|
||||
GuildId: 0, //guild id
|
||||
VoiceAdapter: 0, //guild VoiceAdapter
|
||||
If ffmpeg is already available on the host PATH, use `ffmpeg.mode: 'native'`.
|
||||
|
||||
### AudioManager Example
|
||||
|
||||
```ts
|
||||
import { AudioManager } from 'discord-audio-stream';
|
||||
|
||||
const manager = new AudioManager({
|
||||
connection: {
|
||||
guildId: guild.id,
|
||||
channelId: voiceChannel.id,
|
||||
adapterCreator: guild.voiceAdapterCreator,
|
||||
},
|
||||
{
|
||||
ResourceType: '', //resource type like link or file
|
||||
Resource: '', //auto play link or file name
|
||||
source: {
|
||||
type: 'url',
|
||||
url: 'https://example.com/live-stream.mp3',
|
||||
},
|
||||
);
|
||||
ffmpeg: {
|
||||
mode: 'native',
|
||||
},
|
||||
renewIntervalMs: 5_400_000,
|
||||
});
|
||||
|
||||
await manager.start();
|
||||
```
|
||||
|
||||
### Fields and Methods of AudioManager
|
||||
For a file source:
|
||||
|
||||
#### Fields
|
||||
```ts
|
||||
manager.setSource({
|
||||
type: 'file',
|
||||
path: 'audio/intro.mp3',
|
||||
});
|
||||
|
||||
| Name | Type | Security | Description |
|
||||
| --------- | -------- | --------- | ------------------------------------- |
|
||||
| `Active` | **bool** | protected | To check if the connection is active. |
|
||||
| `Playing` | **bool** | protected | To check if it is playing audio. |
|
||||
await manager.start();
|
||||
```
|
||||
|
||||
#### Methods
|
||||
Relative file paths are resolved from `process.cwd()`. URL sources are validated before playback starts.
|
||||
|
||||
| Name | Parameters | Return type | Description |
|
||||
| ----------------------------- | ------------------------------------------------------- | ------------- | ---------------------------------------- |
|
||||
| `OverrideVoiceConnectionData` | `connectionData` (type of **VoiceConnectionDataModel**) | void | To override intern connectionData field. |
|
||||
| `OverrideVoiceAudioDataModel` | `audioData` (type of **VoiceAudioDataModel**) | void | To override intern audioData field. |
|
||||
| `CreateAndPlay` | | Promise<void> | Join channel and start playing audio. |
|
||||
| `CreateConnection` | | void | Let it connect to voice channel. |
|
||||
| `PlayAudio` | | Promise<void> | To start playing audio. |
|
||||
| `PauseAudio` | | void | Pause the audio, if it is playing |
|
||||
| `ResumeAudio` | | void | Resume the audio, if it is paused. |
|
||||
| `SetVolume` | `volume` (type of number, 0 - 100 percent) | void | To set the audio volume. |
|
||||
| `StopConnection` | | Promise<void> | Method to disconnect the voice channel. |
|
||||
| `Dispose` | | void | Dispose all data in object. |
|
||||
## ⚙️ API
|
||||
|
||||
## 📝 Types
|
||||
### Constructor
|
||||
|
||||
- [**VoiceConnection** by discord.js/voice](https://github.com/discordjs/discord.js/blob/main/packages/voice/src/VoiceConnection.ts#L166)
|
||||
- [**AudioPlayer** by discord.js/voice](https://github.com/discordjs/discord.js/blob/main/packages/voice/src/audio/AudioPlayer.ts#L155)
|
||||
- [**AudioResource** by discord.js/voice](https://github.com/discordjs/discord.js/blob/main/packages/voice/src/audio/AudioResource.ts#L44)
|
||||
- [**DiscordGatewayAdapterCreator** by discord.js/voice](https://github.com/discordjs/discord.js/blob/main/packages/voice/src/util/adapter.ts#L50)
|
||||
- [**VoiceConnectionDataModel** by discord-audio-stream](https://github.com/FrauJulian/Discord-Audio-Stream/blob/master/src/types.d.ts#L3)
|
||||
- [**VoiceAudioDataModel** by discord-audio-stream](https://github.com/FrauJulian/Discord-Audio-Stream/blob/master/src/types.d.ts#L21)
|
||||
- [**IDisposable** by discord-audio-stream](https://github.com/FrauJulian/Discord-Audio-Stream/blob/master/src/types.d.ts#L38)
|
||||
- [**IAudioManager** by discord-audio-stream](https://github.com/FrauJulian/Discord-Audio-Stream/blob/master/src/types.d.ts#L45)
|
||||
```ts
|
||||
type AudioManagerOptions = {
|
||||
ffmpeg?: {
|
||||
mode?: 'native' | 'static';
|
||||
executablePath?: string;
|
||||
inputArgs?: readonly string[];
|
||||
outputArgs?: readonly string[];
|
||||
};
|
||||
connection?: {
|
||||
guildId: string;
|
||||
channelId: string;
|
||||
adapterCreator: DiscordGatewayAdapterCreator;
|
||||
};
|
||||
source?: { type: 'url'; url: string } | { type: 'file'; path: string };
|
||||
renewIntervalMs?: number | false;
|
||||
connectTimeoutMs?: number;
|
||||
volume?: {
|
||||
enabled?: boolean;
|
||||
initialPercent?: number;
|
||||
};
|
||||
};
|
||||
```
|
||||
|
||||
## 📋 Contributors:
|
||||
### Defaults
|
||||
|
||||
| Option | Default |
|
||||
| ------------------ | ----------- |
|
||||
| `ffmpeg.mode` | `'native'` |
|
||||
| `connectTimeoutMs` | `20_000` |
|
||||
| `renewIntervalMs` | `5_400_000` |
|
||||
| `volume.enabled` | `false` |
|
||||
|
||||
### Methods
|
||||
|
||||
| Method | Description |
|
||||
| ------------------------ | ---------------------------------------------------------------------------------- |
|
||||
| `setConnection(options)` | Replaces the voice connection target. |
|
||||
| `setSource(source)` | Replaces the audio source. |
|
||||
| `connect()` | Joins the configured Discord voice channel. |
|
||||
| `play(source?)` | Starts playback on an existing connection. |
|
||||
| `start()` | Connects and starts playback. |
|
||||
| `pause()` | Pauses active playback. |
|
||||
| `resume()` | Resumes paused playback. |
|
||||
| `stop()` | Stops playback, clears renewal, and destroys the voice connection. |
|
||||
| `setVolume(percent)` | Sets volume from `0` to `100`; requires `volume.enabled: true`. |
|
||||
| `dispose()` | Idempotently releases timers, ffmpeg, streams, player state, and voice connection. |
|
||||
|
||||
### State
|
||||
|
||||
```ts
|
||||
manager.state; // 'idle' | 'connecting' | 'ready' | 'playing' | 'paused' | 'stopped' | 'disposed'
|
||||
manager.isPlaying;
|
||||
manager.isConnected;
|
||||
```
|
||||
|
||||
## 🔊 Audio Options
|
||||
|
||||
### Volume
|
||||
|
||||
Inline volume has a runtime cost in `@discordjs/voice`, so it is disabled by default.
|
||||
|
||||
```ts
|
||||
const manager = new AudioManager({
|
||||
connection,
|
||||
source,
|
||||
volume: {
|
||||
enabled: true,
|
||||
initialPercent: 50,
|
||||
},
|
||||
});
|
||||
|
||||
await manager.start();
|
||||
manager.setVolume(25);
|
||||
```
|
||||
|
||||
Calling `setVolume()` without `volume.enabled: true` throws `AudioManagerStateError`.
|
||||
|
||||
### ffmpeg Modes
|
||||
|
||||
- `mode: 'native'` uses the `ffmpeg` executable from the host environment.
|
||||
- `mode: 'static'` resolves the optional `ffmpeg-static` package.
|
||||
- `executablePath` overrides both modes and is useful for Docker images or custom ffmpeg builds.
|
||||
|
||||
Default output is raw Discord-compatible PCM: `s16le`, `48000 Hz`, `2 channels`.
|
||||
|
||||
You can override ffmpeg arguments through `ffmpeg.inputArgs` and `ffmpeg.outputArgs`. When you override them, you are
|
||||
responsible for keeping the output compatible with `StreamType.Raw`.
|
||||
|
||||
### Renewal
|
||||
|
||||
By default, the manager schedules a renewal after `5_400_000 ms` so long-running streams can reconnect periodically.
|
||||
Set `renewIntervalMs: false` to disable this behavior:
|
||||
|
||||
```ts
|
||||
const manager = new AudioManager({
|
||||
connection,
|
||||
source,
|
||||
renewIntervalMs: false,
|
||||
});
|
||||
```
|
||||
|
||||
`stop()` and `dispose()` always clear the renewal timer.
|
||||
|
||||
## 🧯 Errors
|
||||
|
||||
The package exports these error classes:
|
||||
|
||||
- `AudioManagerError`
|
||||
- `AudioManagerConfigError`
|
||||
- `AudioManagerStateError`
|
||||
- `FfmpegProcessError`
|
||||
|
||||
Configuration problems, such as a missing source or invalid URL, throw `AudioManagerConfigError`. Invalid lifecycle
|
||||
operations, such as calling `pause()` while nothing is playing, throw `AudioManagerStateError`.
|
||||
|
||||
## 🧑💻 Development
|
||||
|
||||
```bash
|
||||
npm ci
|
||||
npm run check
|
||||
npm run build
|
||||
```
|
||||
|
||||
## 📋 Contributors
|
||||
|
||||
~ [**FrauJulian - Julian Lechner**](https://fraujulian.xyz/) - CODEOWNER
|
||||
|
||||
## 🤝 Enjoy the package?
|
||||
|
||||
Give it a star ⭐ on [github](https://github.com/FrauJulian/discord-audio-stream)!
|
||||
Give it a star ⭐ on [GitHub](https://github.com/FrauJulian/discord-audio-stream)!
|
||||
|
||||
+46
-9
@@ -2,17 +2,54 @@
|
||||
|
||||
## Supported Versions
|
||||
|
||||
Use this section to tell people about which versions of your project are
|
||||
currently being supported with security updates.
|
||||
Security fixes are provided for the latest published release line.
|
||||
|
||||
| Version | Supported |
|
||||
| ------- | ------------------ |
|
||||
| 0.1.x | :white_check_mark: |
|
||||
| Version | Supported |
|
||||
| ----------------------------------------- | --------- |
|
||||
| Latest release | Yes |
|
||||
| Older releases | No |
|
||||
| Unreleased local forks or modified builds | No |
|
||||
|
||||
If a vulnerability is fixed, the fix will generally be released only for the current supported version unless a backport is clearly necessary.
|
||||
|
||||
## Reporting a Vulnerability
|
||||
|
||||
Use this section to tell people how to report a vulnerability.
|
||||
Do not open a public GitHub issue for security vulnerabilities.
|
||||
|
||||
Tell them where to go, how often they can expect to get an update on a
|
||||
reported vulnerability, what to expect if the vulnerability is accepted or
|
||||
declined, etc.
|
||||
Report vulnerabilities privately by email to `fraujulian@lechner.top`.
|
||||
|
||||
Please include:
|
||||
|
||||
- A clear description of the issue and the expected security impact.
|
||||
- Affected package version or commit, Node.js version, and runtime environment.
|
||||
- Reproduction steps, proof of concept, or a minimal example.
|
||||
- Any relevant logs, stack traces, or dependency details.
|
||||
- Whether you believe the issue is already publicly known.
|
||||
|
||||
## What To Expect
|
||||
|
||||
- Initial acknowledgement is targeted within 7 days.
|
||||
- After triage, you may be asked for more detail or validation.
|
||||
- If the report is accepted, a fix will be prepared and released as soon as reasonably possible.
|
||||
- Coordinated disclosure is preferred. Please wait for a fix or explicit approval before publishing details.
|
||||
- If the report is out of scope or not reproducible, you will be told why.
|
||||
|
||||
## Scope
|
||||
|
||||
This policy covers vulnerabilities in the published `discord-audio-stream` package itself.
|
||||
|
||||
Examples that may be in scope:
|
||||
|
||||
- Input handling issues that could cause unsafe process execution behavior.
|
||||
- Vulnerabilities caused by package logic, lifecycle management, or exposed API behavior.
|
||||
- Security-relevant documentation mistakes that would realistically lead users into unsafe deployment.
|
||||
|
||||
Examples that are usually out of scope:
|
||||
|
||||
- Vulnerabilities in third-party dependencies that are not introduced by this package.
|
||||
- Misconfiguration in a consuming bot, Discord server, host OS, or infrastructure.
|
||||
- Denial of service caused solely by unsupported environments or intentionally extreme workloads.
|
||||
|
||||
## Disclosure
|
||||
|
||||
When a report is confirmed, the goal is to publish a fix and then disclose the issue responsibly through the repository release notes, commit history, or an advisory, depending on severity and impact.
|
||||
|
||||
+2
-2
@@ -36,7 +36,7 @@ const config = [
|
||||
'warn',
|
||||
{ vars: 'all', varsIgnorePattern: '^_', args: 'after-used', argsIgnorePattern: '^_' },
|
||||
],
|
||||
'@typescript-eslint/no-explicit-any': 'off',
|
||||
'@typescript-eslint/no-explicit-any': 'error',
|
||||
|
||||
/* Imports */
|
||||
'import/first': 'error',
|
||||
@@ -46,7 +46,7 @@ const config = [
|
||||
'error',
|
||||
{
|
||||
devDependencies: [
|
||||
'**/*.config.{js,cjs,mjs,ts}',
|
||||
'**/*.config*.{js,cjs,mjs,ts}',
|
||||
'**/scripts/**',
|
||||
'**/*.test.{ts,js}',
|
||||
'**/Testing.{ts,js}',
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
/** @type {import('jest').Config} */
|
||||
module.exports = {
|
||||
clearMocks: true,
|
||||
moduleFileExtensions: ['ts', 'js', 'json'],
|
||||
testEnvironment: 'node',
|
||||
testMatch: ['<rootDir>/tests/**/*.test.ts'],
|
||||
transform: {
|
||||
'^.+\\.ts$': [
|
||||
'ts-jest',
|
||||
{
|
||||
tsconfig: '<rootDir>/tsconfig.test.json',
|
||||
},
|
||||
],
|
||||
},
|
||||
};
|
||||
Generated
+1094
-1529
File diff suppressed because it is too large
Load Diff
+47
-29
@@ -1,8 +1,9 @@
|
||||
{
|
||||
"$schema": "https://json.schemastore.org/package.json",
|
||||
"name": "discord-audio-stream",
|
||||
"version": "0.7.DDDhhmm",
|
||||
"license": "LGPL-2.1-only",
|
||||
"description": "Discord library to make stream any audio easier.",
|
||||
"version": "x.x.x",
|
||||
"license": "LGPL-3.0-only",
|
||||
"description": "A small Discord voice audio streaming library with managed ffmpeg playback.",
|
||||
"exports": {
|
||||
".": {
|
||||
"require": {
|
||||
@@ -25,29 +26,39 @@
|
||||
"lib": "src"
|
||||
},
|
||||
"scripts": {
|
||||
"update:dependencies": "npx npm-check-updates --upgrade",
|
||||
"update:version": "node set-version.js",
|
||||
"version:place": "node set-version.js set-ci-version",
|
||||
"version:check": "node set-version.js check-placeholder",
|
||||
"version:fix": "node set-version.js fix-placeholder",
|
||||
"lint": "eslint . --ext .ts,.tsx,.js,.cjs,.mjs",
|
||||
"lint:fix": "eslint . --ext .ts,.tsx,.js,.cjs,.mjs --fix",
|
||||
"lint:types": "eslint . --config eslint.config.typeaware.cjs --ext .ts,.tsx",
|
||||
"format": "prettier --write .",
|
||||
"format:check": "prettier --check .",
|
||||
"build": "del-cli dist && npm run update:version && tsup",
|
||||
"typecheck": "tsc --noEmit",
|
||||
"test": "jest --runInBand",
|
||||
"check": "npm run version:check && npm run format:check && npm run lint && npm run lint:types && npm run typecheck && npm run test",
|
||||
"fix": "npm run version:fix && npm run format && npm run lint:fix",
|
||||
"build": "node -e \"require('node:fs').rmSync('dist', { recursive: true, force: true })\" && tsup && tsc -p tsconfig.build.json && node scripts/copy-dts.cjs",
|
||||
"prepare": "husky"
|
||||
},
|
||||
"repository": "https://github.com/FrauJulian/Discord-Audio-Stream",
|
||||
"repository": {
|
||||
"type": "git",
|
||||
"url": "git+https://github.com/FrauJulian/Discord-Audio-Stream.git"
|
||||
},
|
||||
"bugs": "https://github.com/FrauJulian/Discord-Audio-Stream/issues",
|
||||
"funding": "https://ko-fi.com/FrauJulian",
|
||||
"keywords": [
|
||||
"discordjs",
|
||||
"discord",
|
||||
"discord.js",
|
||||
"audio",
|
||||
"voice",
|
||||
"streaming",
|
||||
"discordjs/voice",
|
||||
"music",
|
||||
"voice",
|
||||
"audio",
|
||||
"24/7"
|
||||
],
|
||||
"contributors": [
|
||||
"FrauJulian - Lechner Julian <fraujulian@lechner.top>"
|
||||
"Julian Lechner - FrauJulian <fraujulian@lechner.top>"
|
||||
],
|
||||
"lint-staged": {
|
||||
"*.{ts,tsx,js,cjs,mjs}": [
|
||||
@@ -58,37 +69,44 @@
|
||||
"prettier --write"
|
||||
]
|
||||
},
|
||||
"dependencies": {
|
||||
"@typescript-eslint/eslint-plugin": "^8.50.0",
|
||||
"@typescript-eslint/parser": "^8.50.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@jest/globals": "^30.4.1",
|
||||
"@types/ejs": "^3.1.5",
|
||||
"@types/node": "^25.0.2",
|
||||
"del-cli": "^7.0.0",
|
||||
"eslint": "^9.39.2",
|
||||
"@types/node": "^25.9.1",
|
||||
"@typescript-eslint/eslint-plugin": "^8.60.0",
|
||||
"@typescript-eslint/parser": "^8.60.0",
|
||||
"eslint": "^9.39.4",
|
||||
"eslint-config-prettier": "^10.1.8",
|
||||
"eslint-import-resolver-typescript": "^4.4.4",
|
||||
"eslint-plugin-import": "^2.32.0",
|
||||
"eslint-plugin-n": "^17.23.1",
|
||||
"eslint-plugin-promise": "^7.2.1",
|
||||
"eslint-plugin-unused-imports": "^4.3.0",
|
||||
"eslint-plugin-n": "^18.0.1",
|
||||
"eslint-plugin-promise": "^7.3.0",
|
||||
"eslint-plugin-unused-imports": "^4.4.1",
|
||||
"husky": "^9.1.7",
|
||||
"npm-check-updates": "^19.2.0",
|
||||
"prettier": "^3.7.4",
|
||||
"ts-jest": "^29.4.6",
|
||||
"jest": "^30.4.2",
|
||||
"prettier": "^3.8.3",
|
||||
"ts-jest": "^29.4.11",
|
||||
"tsup": "^8.5.1",
|
||||
"typescript": "^5.9.3"
|
||||
"typescript": "^6.0.3"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"@discordjs/voice": "^0.19.0",
|
||||
"@snazzah/davey": "^0.1.8",
|
||||
"libsodium-wrappers": "^0.7.15",
|
||||
"@discordjs/voice": "^0.19.2",
|
||||
"@snazzah/davey": "^0.1.11",
|
||||
"ffmpeg-static": "^5.3.0",
|
||||
"libsodium-wrappers": "^0.8.4",
|
||||
"opusscript": "^0.0.8",
|
||||
"prism-media": "^1.3.5"
|
||||
},
|
||||
"peerDependenciesMeta": {
|
||||
"ffmpeg-static": {
|
||||
"optional": true
|
||||
},
|
||||
"libsodium-wrappers": {
|
||||
"optional": true
|
||||
}
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=22.12.0"
|
||||
"node": ">=22.22.3"
|
||||
},
|
||||
"private": false,
|
||||
"publishConfig": {
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
const { copyFileSync, existsSync } = require('node:fs');
|
||||
const { join } = require('node:path');
|
||||
|
||||
const declarationFile = join(__dirname, '..', 'dist', 'index.d.ts');
|
||||
const esmDeclarationFile = join(__dirname, '..', 'dist', 'index.d.mts');
|
||||
|
||||
if (!existsSync(declarationFile)) {
|
||||
throw new Error(`Missing declaration file: ${declarationFile}`);
|
||||
}
|
||||
|
||||
copyFileSync(declarationFile, esmDeclarationFile);
|
||||
+95
-13
@@ -1,21 +1,103 @@
|
||||
const fs = require('fs');
|
||||
|
||||
const pkg = JSON.parse(fs.readFileSync('package.json', 'utf8').toString());
|
||||
const lockFilePath = 'package-lock.json';
|
||||
const packageFilePath = 'package.json';
|
||||
const placeholderVersion = 'x.x.x';
|
||||
const command = process.argv[2];
|
||||
|
||||
const [major, minor] = pkg.version.split('.');
|
||||
const prefix = `${major}.${minor}.`;
|
||||
function readJson(path) {
|
||||
return JSON.parse(fs.readFileSync(path, 'utf8').toString());
|
||||
}
|
||||
|
||||
const now = new Date();
|
||||
const start = new Date(now.getFullYear(), 0, 0);
|
||||
const diff = now - start;
|
||||
const dayOfYear = Math.floor(diff / (1000 * 60 * 60 * 24));
|
||||
function writeJson(path, value, spaces) {
|
||||
fs.writeFileSync(path, `${JSON.stringify(value, null, spaces)}\n`);
|
||||
}
|
||||
|
||||
const hh = String(now.getHours()).padStart(2, '0');
|
||||
const mm = String(now.getMinutes()).padStart(2, '0');
|
||||
function getLockFile() {
|
||||
if (!fs.existsSync(lockFilePath)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
const newVersion = `${prefix}${String(dayOfYear).padStart(3, '0')}${hh}${mm}`;
|
||||
return readJson(lockFilePath);
|
||||
}
|
||||
|
||||
pkg.version = newVersion;
|
||||
fs.writeFileSync('package.json', JSON.stringify(pkg, null, 2));
|
||||
function writeVersions(version) {
|
||||
const pkg = readJson(packageFilePath);
|
||||
pkg.version = version;
|
||||
writeJson(packageFilePath, pkg, 2);
|
||||
|
||||
console.log('Version set to: ', newVersion);
|
||||
const lock = getLockFile();
|
||||
|
||||
if (lock) {
|
||||
lock.version = version;
|
||||
|
||||
if (lock.packages?.['']) {
|
||||
lock.packages[''].version = version;
|
||||
}
|
||||
|
||||
writeJson(lockFilePath, lock, 4);
|
||||
}
|
||||
}
|
||||
|
||||
function checkPlaceholder() {
|
||||
const pkg = readJson(packageFilePath);
|
||||
const lock = getLockFile();
|
||||
const errors = [];
|
||||
|
||||
if (pkg.version !== placeholderVersion) {
|
||||
errors.push(`package.json version must be "${placeholderVersion}", got "${pkg.version}"`);
|
||||
}
|
||||
|
||||
if (lock && lock.version !== placeholderVersion) {
|
||||
errors.push(`package-lock.json version must be "${placeholderVersion}", got "${lock.version}"`);
|
||||
}
|
||||
|
||||
if (lock?.packages?.[''] && lock.packages[''].version !== placeholderVersion) {
|
||||
errors.push(
|
||||
`package-lock.json packages[""] version must be "${placeholderVersion}", got "${lock.packages[''].version}"`,
|
||||
);
|
||||
}
|
||||
|
||||
if (errors.length > 0) {
|
||||
for (const error of errors) {
|
||||
console.error(error);
|
||||
}
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
console.log(`Version placeholder validated: ${placeholderVersion}`);
|
||||
}
|
||||
|
||||
function fixPlaceholder() {
|
||||
writeVersions(placeholderVersion);
|
||||
console.log(`Version placeholder set to: ${placeholderVersion}`);
|
||||
}
|
||||
|
||||
function getCiVersion() {
|
||||
const major = process.env.VERSION_MAJOR;
|
||||
const minor = process.env.VERSION_MINOR;
|
||||
const patch = process.env.VERSION_PATCH ?? process.env.GITHUB_RUN_NUMBER;
|
||||
const segments = { major, minor, patch };
|
||||
|
||||
for (const [name, value] of Object.entries(segments)) {
|
||||
if (!/^\d+$/.test(value ?? '')) {
|
||||
console.error(`Missing or invalid ${name} version segment: "${value ?? ''}"`);
|
||||
process.exit(1);
|
||||
}
|
||||
}
|
||||
|
||||
return `${major}.${minor}.${patch}`;
|
||||
}
|
||||
|
||||
if (command === 'check-placeholder') {
|
||||
checkPlaceholder();
|
||||
} else if (command === 'fix-placeholder') {
|
||||
fixPlaceholder();
|
||||
} else if (command === 'set-ci-version') {
|
||||
const ciVersion = getCiVersion();
|
||||
writeVersions(ciVersion);
|
||||
console.log(`CI version set to: ${ciVersion}`);
|
||||
} else {
|
||||
console.error('Invalid command. Use one of: check-placeholder, fix-placeholder, set-ci-version');
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
+225
-165
@@ -8,190 +8,250 @@ import {
|
||||
StreamType,
|
||||
VoiceConnectionStatus,
|
||||
} from '@discordjs/voice';
|
||||
import { join } from 'node:path';
|
||||
import type { IAudioManager, IDisposable, VoiceAudioDataModel, VoiceConnectionDataModel } from './types';
|
||||
import { spawn } from 'node:child_process';
|
||||
import type { Readable } from 'node:stream';
|
||||
import { isAbsolute, resolve } from 'node:path';
|
||||
|
||||
export default class AudioManager implements IAudioManager, IDisposable {
|
||||
private voiceConnection?: VoiceConnection | null;
|
||||
private audioPlayer?: AudioPlayer | null;
|
||||
private audioResource?: AudioResource | null;
|
||||
import { AudioManagerConfigError, AudioManagerStateError } from './errors';
|
||||
import { startFfmpeg, type FfmpegProcessHandle } from './ffmpeg';
|
||||
import type {
|
||||
AudioManagerOptions,
|
||||
AudioSource,
|
||||
PlaybackState,
|
||||
ResolvedAudioSource,
|
||||
VoiceConnectionOptions,
|
||||
} from './types';
|
||||
|
||||
protected Active?: boolean | null;
|
||||
protected Playing?: boolean | null;
|
||||
const DEFAULT_CONNECT_TIMEOUT_MS = 20_000;
|
||||
const DEFAULT_RENEW_INTERVAL_MS = 5_400_000;
|
||||
|
||||
private timeout?: NodeJS.Timeout | null;
|
||||
private ffmpegProcess?: ReturnType<typeof spawn> | null;
|
||||
private pcmStream?: Readable | null;
|
||||
export default class AudioManager {
|
||||
private readonly audioPlayer: AudioPlayer;
|
||||
|
||||
constructor(
|
||||
private readonly ffmpegMode: 'Native' | 'Standalone',
|
||||
private renewMs: number | null = null,
|
||||
private connectionData: VoiceConnectionDataModel | null = null,
|
||||
private audioData: VoiceAudioDataModel | null = null,
|
||||
) {
|
||||
this.renewMs = renewMs ? renewMs : 5400000;
|
||||
}
|
||||
|
||||
public OverrideVoiceConnectionData(connectionData: VoiceConnectionDataModel): void {
|
||||
this.connectionData = connectionData;
|
||||
}
|
||||
|
||||
public OverrideVoiceAudioDataModel(audioData: VoiceAudioDataModel): void {
|
||||
this.audioData = audioData;
|
||||
}
|
||||
|
||||
public CreateConnection(): void {
|
||||
this.voiceConnection = joinVoiceChannel({
|
||||
channelId: this.connectionData!.VoiceChannelId,
|
||||
guildId: this.connectionData!.GuildId,
|
||||
adapterCreator: this.connectionData!.VoiceAdapter,
|
||||
});
|
||||
|
||||
this.timeout = setTimeout(async (): Promise<void> => {
|
||||
await this.StopConnection();
|
||||
await this.CreateAndPlay();
|
||||
}, this.renewMs!);
|
||||
}
|
||||
|
||||
public async PlayAudio(): Promise<void> {
|
||||
if (!this.audioData || !this.voiceConnection) return;
|
||||
|
||||
await entersState(this.voiceConnection!, VoiceConnectionStatus.Ready, 20_000);
|
||||
|
||||
if (this.ffmpegProcess) {
|
||||
this.ffmpegProcess.kill('SIGKILL');
|
||||
this.ffmpegProcess = null;
|
||||
}
|
||||
|
||||
let source: string;
|
||||
|
||||
if (this.audioData!.ResourceType === 'File') {
|
||||
source = join(__dirname, this.audioData!.Resource);
|
||||
} else if (this.audioData!.ResourceType === 'Link') {
|
||||
source = this.audioData!.Resource;
|
||||
} else {
|
||||
throw new TypeError('Invalid resource type.');
|
||||
}
|
||||
|
||||
this.ffmpegProcess = spawn(
|
||||
this.ffmpegMode === 'Native' ? 'ffmpeg' : require('ffmpeg-static'),
|
||||
[
|
||||
'-loglevel',
|
||||
'error',
|
||||
'-i',
|
||||
source,
|
||||
'-analyzeduration',
|
||||
'0',
|
||||
'-f',
|
||||
's16le',
|
||||
'-ar',
|
||||
'48000',
|
||||
'-ac',
|
||||
'2',
|
||||
'pipe:1',
|
||||
],
|
||||
{
|
||||
stdio: ['ignore', 'pipe', 'pipe'],
|
||||
},
|
||||
);
|
||||
|
||||
this.pcmStream = this.ffmpegProcess!.stdout as Readable;
|
||||
|
||||
this.audioResource = createAudioResource(this.pcmStream, {
|
||||
inputType: StreamType.Raw,
|
||||
inlineVolume: true,
|
||||
});
|
||||
private connection: VoiceConnection | undefined;
|
||||
private resource: AudioResource | undefined;
|
||||
private ffmpeg: FfmpegProcessHandle | undefined;
|
||||
private renewTimer: NodeJS.Timeout | undefined;
|
||||
private playbackState: PlaybackState = 'idle';
|
||||
private connectionOptions: VoiceConnectionOptions | undefined;
|
||||
private audioSource: AudioSource | undefined;
|
||||
private readonly options: Required<Pick<AudioManagerOptions, 'connectTimeoutMs'>> &
|
||||
Omit<AudioManagerOptions, 'connectTimeoutMs'>;
|
||||
|
||||
public constructor(options: AudioManagerOptions = {}) {
|
||||
this.options = {
|
||||
...options,
|
||||
connectTimeoutMs: options.connectTimeoutMs ?? DEFAULT_CONNECT_TIMEOUT_MS,
|
||||
};
|
||||
this.connectionOptions = options.connection;
|
||||
this.audioSource = options.source;
|
||||
this.audioPlayer = createAudioPlayer({
|
||||
behaviors: {
|
||||
noSubscriber: NoSubscriberBehavior.Play,
|
||||
},
|
||||
});
|
||||
|
||||
this.voiceConnection!.subscribe(this.audioPlayer);
|
||||
|
||||
this.audioPlayer.play(this.audioResource);
|
||||
this.Playing = true;
|
||||
}
|
||||
|
||||
public PauseAudio(): void {
|
||||
if (this.Playing) {
|
||||
this.audioPlayer!.pause();
|
||||
this.Playing = false;
|
||||
} else {
|
||||
throw new ReferenceError('Audio is not playing.');
|
||||
public get state(): PlaybackState {
|
||||
return this.playbackState;
|
||||
}
|
||||
|
||||
public get isPlaying(): boolean {
|
||||
return this.playbackState === 'playing';
|
||||
}
|
||||
|
||||
public get isConnected(): boolean {
|
||||
return Boolean(this.connection);
|
||||
}
|
||||
|
||||
public setConnection(options: VoiceConnectionOptions): void {
|
||||
this.assertNotDisposed();
|
||||
this.connectionOptions = options;
|
||||
}
|
||||
|
||||
public setSource(source: AudioSource): void {
|
||||
this.assertNotDisposed();
|
||||
this.audioSource = source;
|
||||
}
|
||||
|
||||
public async connect(): Promise<void> {
|
||||
this.assertNotDisposed();
|
||||
|
||||
if (!this.connectionOptions) {
|
||||
throw new AudioManagerConfigError('Voice connection options are required before connecting.');
|
||||
}
|
||||
|
||||
this.clearRenewTimer();
|
||||
this.playbackState = 'connecting';
|
||||
this.connection?.destroy();
|
||||
this.connection = joinVoiceChannel({
|
||||
guildId: this.connectionOptions.guildId,
|
||||
channelId: this.connectionOptions.channelId,
|
||||
adapterCreator: this.connectionOptions.adapterCreator,
|
||||
});
|
||||
this.connection.subscribe(this.audioPlayer);
|
||||
|
||||
await entersState(this.connection, VoiceConnectionStatus.Ready, this.options.connectTimeoutMs);
|
||||
this.playbackState = 'ready';
|
||||
this.scheduleRenewal();
|
||||
}
|
||||
|
||||
public async play(source?: AudioSource): Promise<void> {
|
||||
this.assertNotDisposed();
|
||||
|
||||
if (source) {
|
||||
this.setSource(source);
|
||||
}
|
||||
|
||||
if (!this.connection) {
|
||||
throw new AudioManagerStateError('A voice connection is required before audio can be played.');
|
||||
}
|
||||
|
||||
const resolvedSource = this.resolveSource();
|
||||
this.stopCurrentPlayback();
|
||||
this.ffmpeg = startFfmpeg(resolvedSource.input, this.options.ffmpeg);
|
||||
this.resource = createAudioResource(this.ffmpeg.process.stdout, {
|
||||
inputType: StreamType.Raw,
|
||||
inlineVolume: this.options.volume?.enabled === true,
|
||||
});
|
||||
|
||||
if (this.options.volume?.enabled === true && this.options.volume.initialPercent !== undefined) {
|
||||
this.setVolume(this.options.volume.initialPercent);
|
||||
}
|
||||
|
||||
this.audioPlayer.play(this.resource);
|
||||
this.playbackState = 'playing';
|
||||
}
|
||||
|
||||
public async start(): Promise<void> {
|
||||
await this.connect();
|
||||
await this.play();
|
||||
}
|
||||
|
||||
public pause(): void {
|
||||
this.assertNotDisposed();
|
||||
|
||||
if (this.playbackState !== 'playing') {
|
||||
throw new AudioManagerStateError('Audio can only be paused while it is playing.');
|
||||
}
|
||||
|
||||
this.audioPlayer.pause();
|
||||
this.playbackState = 'paused';
|
||||
}
|
||||
|
||||
public resume(): void {
|
||||
this.assertNotDisposed();
|
||||
|
||||
if (this.playbackState !== 'paused') {
|
||||
throw new AudioManagerStateError('Audio can only be resumed while it is paused.');
|
||||
}
|
||||
|
||||
this.audioPlayer.unpause();
|
||||
this.playbackState = 'playing';
|
||||
}
|
||||
|
||||
public async stop(): Promise<void> {
|
||||
if (this.playbackState === 'disposed') {
|
||||
return;
|
||||
}
|
||||
|
||||
this.clearRenewTimer();
|
||||
this.stopCurrentPlayback();
|
||||
this.audioPlayer.stop(true);
|
||||
this.connection?.disconnect();
|
||||
this.connection?.destroy();
|
||||
this.connection = undefined;
|
||||
this.playbackState = 'stopped';
|
||||
}
|
||||
|
||||
public setVolume(volumeInPercent: number): void {
|
||||
this.assertNotDisposed();
|
||||
|
||||
if (this.options.volume?.enabled !== true) {
|
||||
throw new AudioManagerStateError('Volume control requires volume.enabled to be true.');
|
||||
}
|
||||
|
||||
if (volumeInPercent < 0 || volumeInPercent > 100) {
|
||||
throw new AudioManagerConfigError('Volume must be between 0 and 100 percent.');
|
||||
}
|
||||
|
||||
if (!this.resource?.volume) {
|
||||
throw new AudioManagerStateError('No audio resource with volume control is currently active.');
|
||||
}
|
||||
|
||||
this.resource.volume.setVolume(volumeInPercent / 100);
|
||||
}
|
||||
|
||||
public dispose(): void {
|
||||
if (this.playbackState === 'disposed') {
|
||||
return;
|
||||
}
|
||||
|
||||
this.clearRenewTimer();
|
||||
this.stopCurrentPlayback();
|
||||
this.audioPlayer.stop(true);
|
||||
this.connection?.destroy();
|
||||
this.connection = undefined;
|
||||
this.connectionOptions = undefined;
|
||||
this.audioSource = undefined;
|
||||
this.playbackState = 'disposed';
|
||||
}
|
||||
|
||||
private resolveSource(): ResolvedAudioSource {
|
||||
if (!this.audioSource) {
|
||||
throw new AudioManagerConfigError('Audio source is required before playback can start.');
|
||||
}
|
||||
|
||||
if (this.audioSource.type === 'url') {
|
||||
try {
|
||||
return {
|
||||
input: new URL(this.audioSource.url).toString(),
|
||||
source: this.audioSource,
|
||||
};
|
||||
} catch (error) {
|
||||
throw new AudioManagerConfigError(`Invalid audio source URL. Cause: ${String(error)}`);
|
||||
}
|
||||
}
|
||||
|
||||
return {
|
||||
input: isAbsolute(this.audioSource.path)
|
||||
? this.audioSource.path
|
||||
: resolve(process.cwd(), this.audioSource.path),
|
||||
source: this.audioSource,
|
||||
};
|
||||
}
|
||||
|
||||
private scheduleRenewal(): void {
|
||||
const renewIntervalMs = this.options.renewIntervalMs ?? DEFAULT_RENEW_INTERVAL_MS;
|
||||
|
||||
if (renewIntervalMs === false) {
|
||||
return;
|
||||
}
|
||||
|
||||
this.renewTimer = setTimeout(() => {
|
||||
void this.start();
|
||||
}, renewIntervalMs);
|
||||
|
||||
if (typeof this.renewTimer.unref === 'function') {
|
||||
this.renewTimer.unref();
|
||||
}
|
||||
}
|
||||
|
||||
public ResumeAudio(): void {
|
||||
if (!this.Playing) {
|
||||
this.audioPlayer!.unpause();
|
||||
this.Playing = true;
|
||||
} else {
|
||||
throw new ReferenceError('Audio is playing.');
|
||||
private clearRenewTimer(): void {
|
||||
if (this.renewTimer) {
|
||||
clearTimeout(this.renewTimer);
|
||||
this.renewTimer = undefined;
|
||||
}
|
||||
}
|
||||
|
||||
public async CreateAndPlay(): Promise<void> {
|
||||
this.CreateConnection();
|
||||
await this.PlayAudio();
|
||||
private stopCurrentPlayback(): void {
|
||||
this.resource?.playStream.destroy();
|
||||
this.resource = undefined;
|
||||
this.ffmpeg?.stop();
|
||||
this.ffmpeg = undefined;
|
||||
}
|
||||
|
||||
public async StopConnection(): Promise<void> {
|
||||
this.voiceConnection?.disconnect();
|
||||
this.voiceConnection?.destroy();
|
||||
this.voiceConnection = null;
|
||||
|
||||
this.Active = false;
|
||||
this.Playing = false;
|
||||
}
|
||||
|
||||
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);
|
||||
}
|
||||
|
||||
public Dispose(): void {
|
||||
try {
|
||||
if (this.timeout) {
|
||||
clearTimeout(this.timeout);
|
||||
}
|
||||
|
||||
if (this.audioPlayer) {
|
||||
this.audioPlayer.stop(true);
|
||||
}
|
||||
|
||||
if (this.audioPlayer) {
|
||||
this.audioPlayer!.stop();
|
||||
|
||||
if (this.audioResource && this.audioResource.playStream) {
|
||||
this.audioResource!.playStream.destroy();
|
||||
}
|
||||
}
|
||||
|
||||
if (this.voiceConnection) {
|
||||
this.voiceConnection!.destroy();
|
||||
}
|
||||
|
||||
if (this.ffmpegProcess) {
|
||||
this.ffmpegProcess.kill('SIGKILL');
|
||||
this.ffmpegProcess = null;
|
||||
}
|
||||
|
||||
this.pcmStream?.destroy();
|
||||
this.pcmStream = null;
|
||||
|
||||
this.audioPlayer = null;
|
||||
this.audioResource = null;
|
||||
this.voiceConnection = null;
|
||||
this.timeout = null;
|
||||
this.Active = null;
|
||||
this.Playing = null;
|
||||
this.connectionData = null;
|
||||
this.audioData = null;
|
||||
this.renewMs = null;
|
||||
} catch {}
|
||||
private assertNotDisposed(): void {
|
||||
if (this.playbackState === 'disposed') {
|
||||
throw new AudioManagerStateError('AudioManager has been disposed.');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
export class AudioManagerError extends Error {
|
||||
public constructor(message: string) {
|
||||
super(message);
|
||||
this.name = new.target.name;
|
||||
}
|
||||
}
|
||||
|
||||
export class AudioManagerConfigError extends AudioManagerError {}
|
||||
|
||||
export class AudioManagerStateError extends AudioManagerError {}
|
||||
|
||||
export class FfmpegProcessError extends AudioManagerError {
|
||||
public constructor(
|
||||
message: string,
|
||||
public readonly cause?: unknown,
|
||||
) {
|
||||
super(message);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,83 @@
|
||||
import { spawn } from 'node:child_process';
|
||||
import type { ChildProcessByStdio } from 'node:child_process';
|
||||
import { createRequire } from 'node:module';
|
||||
import type { Readable } from 'node:stream';
|
||||
|
||||
import { AudioManagerConfigError } from './errors';
|
||||
import type { FfmpegOptions } from './types';
|
||||
|
||||
const requireFromCurrentModule = createRequire(__filename);
|
||||
|
||||
const DEFAULT_INPUT_ARGS = ['-hide_banner', '-loglevel', 'error', '-nostdin'] as const;
|
||||
const DEFAULT_OUTPUT_ARGS = ['-vn', '-f', 's16le', '-ar', '48000', '-ac', '2', 'pipe:1'] as const;
|
||||
const FORCE_KILL_TIMEOUT_MS = 2_000;
|
||||
|
||||
export type FfmpegProcessHandle = {
|
||||
process: ChildProcessByStdio<null, Readable, Readable>;
|
||||
stop(): void;
|
||||
};
|
||||
|
||||
export function resolveFfmpegExecutable(options: FfmpegOptions = {}): string {
|
||||
if (options.executablePath?.trim()) {
|
||||
return options.executablePath;
|
||||
}
|
||||
|
||||
if ((options.mode ?? 'native') === 'native') {
|
||||
return 'ffmpeg';
|
||||
}
|
||||
|
||||
try {
|
||||
const executable = requireFromCurrentModule('ffmpeg-static') as unknown;
|
||||
|
||||
if (typeof executable === 'string' && executable.length > 0) {
|
||||
return executable;
|
||||
}
|
||||
} catch (error) {
|
||||
throw new AudioManagerConfigError(
|
||||
`Unable to resolve ffmpeg-static. Install it or pass ffmpeg.executablePath. Cause: ${String(error)}`,
|
||||
);
|
||||
}
|
||||
|
||||
throw new AudioManagerConfigError('ffmpeg-static did not expose an executable path.');
|
||||
}
|
||||
|
||||
export function startFfmpeg(input: string, options: FfmpegOptions = {}): FfmpegProcessHandle {
|
||||
const executable = resolveFfmpegExecutable(options);
|
||||
const args = [
|
||||
...(options.inputArgs ?? DEFAULT_INPUT_ARGS),
|
||||
'-i',
|
||||
input,
|
||||
...(options.outputArgs ?? DEFAULT_OUTPUT_ARGS),
|
||||
];
|
||||
const childProcess = spawn(executable, args, { stdio: ['ignore', 'pipe', 'pipe'] });
|
||||
|
||||
childProcess.once('error', () => undefined);
|
||||
childProcess.stderr.resume();
|
||||
|
||||
return {
|
||||
process: childProcess,
|
||||
stop: (): void => {
|
||||
stopProcess(childProcess);
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
function stopProcess(childProcess: ChildProcessByStdio<null, Readable, Readable>): void {
|
||||
childProcess.stdout.destroy();
|
||||
childProcess.stderr.destroy();
|
||||
childProcess.removeAllListeners();
|
||||
|
||||
if (childProcess.killed || childProcess.exitCode !== null || childProcess.signalCode !== null) {
|
||||
return;
|
||||
}
|
||||
|
||||
childProcess.kill('SIGTERM');
|
||||
|
||||
const forceKillTimeout = setTimeout(() => {
|
||||
if (!childProcess.killed && childProcess.exitCode === null && childProcess.signalCode === null) {
|
||||
childProcess.kill('SIGKILL');
|
||||
}
|
||||
}, FORCE_KILL_TIMEOUT_MS);
|
||||
|
||||
forceKillTimeout.unref();
|
||||
}
|
||||
+10
-1
@@ -1,2 +1,11 @@
|
||||
export { default as AudioManager } from './audio-manager';
|
||||
export type { VoiceAudioDataModel, VoiceConnectionDataModel } from './types';
|
||||
export { AudioManagerConfigError, AudioManagerError, AudioManagerStateError, FfmpegProcessError } from './errors';
|
||||
export type {
|
||||
AudioManagerOptions,
|
||||
AudioSource,
|
||||
FfmpegMode,
|
||||
FfmpegOptions,
|
||||
PlaybackState,
|
||||
VoiceConnectionOptions,
|
||||
VolumeOptions,
|
||||
} from './types';
|
||||
|
||||
Vendored
-55
@@ -1,55 +0,0 @@
|
||||
import type { DiscordGatewayAdapterCreator } from '@discordjs/voice';
|
||||
|
||||
export type VoiceConnectionDataModel = {
|
||||
/**
|
||||
* The ID of the voice channel to connect to.
|
||||
*/
|
||||
VoiceChannelId: string;
|
||||
|
||||
/**
|
||||
* The Id of the guild (server) to connect to.
|
||||
*/
|
||||
GuildId: string;
|
||||
|
||||
/**
|
||||
* The adapter creator for the voice connection.
|
||||
* Can be archived by the guild instance via the voiceAdapterCreator property.
|
||||
*/
|
||||
VoiceAdapter: DiscordGatewayAdapterCreator;
|
||||
};
|
||||
|
||||
export type 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;
|
||||
};
|
||||
|
||||
/**
|
||||
* An interface which is implemented in audio manager
|
||||
* for a proper Dispose functionality.
|
||||
*/
|
||||
export type IDisposable = {
|
||||
Dispose(): void;
|
||||
};
|
||||
|
||||
/**
|
||||
* An interface to handle instances later on.
|
||||
*/
|
||||
export type IAudioManager = {
|
||||
OverrideVoiceConnectionData(connectionData: VoiceConnectionDataModel): void;
|
||||
OverrideVoiceAudioDataModel(audioData: VoiceAudioDataModel): void;
|
||||
CreateAndPlay(): Promise<void>;
|
||||
CreateConnection(): void;
|
||||
PlayAudio(): Promise<void>;
|
||||
PauseAudio(): void;
|
||||
ResumeAudio(): void;
|
||||
StopConnection(): Promise<void>;
|
||||
SetVolume(volumeInPercent: number): void;
|
||||
};
|
||||
+178
@@ -0,0 +1,178 @@
|
||||
import type { DiscordGatewayAdapterCreator } from '@discordjs/voice';
|
||||
|
||||
/**
|
||||
* Strategy used to resolve the ffmpeg executable.
|
||||
*
|
||||
* - `native` uses the `ffmpeg` binary available on the host PATH.
|
||||
* - `static` resolves the optional `ffmpeg-static` package.
|
||||
*/
|
||||
export type FfmpegMode = 'native' | 'static';
|
||||
|
||||
/**
|
||||
* Audio input consumed by ffmpeg.
|
||||
*
|
||||
* URL sources are validated through the built-in `URL` constructor before playback starts.
|
||||
* File sources may be absolute or relative; relative paths are resolved from `process.cwd()`.
|
||||
*/
|
||||
export type AudioSource =
|
||||
| {
|
||||
/**
|
||||
* Marks this source as a remote URL.
|
||||
*/
|
||||
type: 'url';
|
||||
|
||||
/**
|
||||
* Fully qualified audio URL passed to ffmpeg.
|
||||
*/
|
||||
url: string;
|
||||
}
|
||||
| {
|
||||
/**
|
||||
* Marks this source as a local file path.
|
||||
*/
|
||||
type: 'file';
|
||||
|
||||
/**
|
||||
* Absolute file path or path relative to `process.cwd()`.
|
||||
*/
|
||||
path: string;
|
||||
};
|
||||
|
||||
/**
|
||||
* Discord voice channel connection settings.
|
||||
*/
|
||||
export type VoiceConnectionOptions = {
|
||||
/**
|
||||
* Discord guild/server ID.
|
||||
*/
|
||||
guildId: string;
|
||||
|
||||
/**
|
||||
* Discord voice channel ID where audio should be played.
|
||||
*/
|
||||
channelId: string;
|
||||
|
||||
/**
|
||||
* Discord voice adapter creator, usually `guild.voiceAdapterCreator` from discord.js.
|
||||
*/
|
||||
adapterCreator: DiscordGatewayAdapterCreator;
|
||||
};
|
||||
|
||||
/**
|
||||
* Public playback lifecycle state exposed by `AudioManager.state`.
|
||||
*/
|
||||
export type PlaybackState = 'idle' | 'connecting' | 'ready' | 'playing' | 'paused' | 'stopped' | 'disposed';
|
||||
|
||||
/**
|
||||
* ffmpeg executable and argument configuration.
|
||||
*/
|
||||
export type FfmpegOptions = {
|
||||
/**
|
||||
* ffmpeg resolution mode.
|
||||
*
|
||||
* @defaultValue `'native'`
|
||||
*/
|
||||
mode?: FfmpegMode;
|
||||
|
||||
/**
|
||||
* Explicit ffmpeg executable path.
|
||||
*
|
||||
* When provided, this value takes precedence over `mode`.
|
||||
*/
|
||||
executablePath?: string;
|
||||
|
||||
/**
|
||||
* Arguments placed before `-i <source>`.
|
||||
*
|
||||
* Override only when you need full control over ffmpeg input behavior.
|
||||
*/
|
||||
inputArgs?: readonly string[];
|
||||
|
||||
/**
|
||||
* Arguments placed after `-i <source>`.
|
||||
*
|
||||
* If overridden, the output must remain compatible with `StreamType.Raw`.
|
||||
*/
|
||||
outputArgs?: readonly string[];
|
||||
};
|
||||
|
||||
/**
|
||||
* Optional inline volume control settings.
|
||||
*/
|
||||
export type VolumeOptions = {
|
||||
/**
|
||||
* Enables Discord voice inline volume support.
|
||||
*
|
||||
* Disabled by default because inline volume has runtime overhead.
|
||||
*
|
||||
* @defaultValue `false`
|
||||
*/
|
||||
enabled?: boolean;
|
||||
|
||||
/**
|
||||
* Initial volume percentage applied when playback starts.
|
||||
*
|
||||
* Requires `enabled: true`.
|
||||
*/
|
||||
initialPercent?: number;
|
||||
};
|
||||
|
||||
/**
|
||||
* Constructor options for `AudioManager`.
|
||||
*/
|
||||
export type AudioManagerOptions = {
|
||||
/**
|
||||
* ffmpeg executable and argument configuration.
|
||||
*/
|
||||
ffmpeg?: FfmpegOptions;
|
||||
|
||||
/**
|
||||
* Initial Discord voice connection settings.
|
||||
*
|
||||
* May also be supplied later through `setConnection()`.
|
||||
*/
|
||||
connection?: VoiceConnectionOptions;
|
||||
|
||||
/**
|
||||
* Initial audio source.
|
||||
*
|
||||
* May also be supplied later through `setSource()` or `play(source)`.
|
||||
*/
|
||||
source?: AudioSource;
|
||||
|
||||
/**
|
||||
* Milliseconds after which the manager reconnects and restarts playback.
|
||||
*
|
||||
* Set to `false` to disable renewal.
|
||||
*
|
||||
* @defaultValue `5_400_000`
|
||||
*/
|
||||
renewIntervalMs?: number | false;
|
||||
|
||||
/**
|
||||
* Maximum milliseconds to wait for the Discord voice connection to become ready.
|
||||
*
|
||||
* @defaultValue `20_000`
|
||||
*/
|
||||
connectTimeoutMs?: number;
|
||||
|
||||
/**
|
||||
* Optional inline volume configuration.
|
||||
*/
|
||||
volume?: VolumeOptions;
|
||||
};
|
||||
|
||||
/**
|
||||
* Internal normalized audio source passed to ffmpeg.
|
||||
*/
|
||||
export type ResolvedAudioSource = {
|
||||
/**
|
||||
* Validated URL or absolute file path passed as ffmpeg input.
|
||||
*/
|
||||
input: string;
|
||||
|
||||
/**
|
||||
* Original source configuration.
|
||||
*/
|
||||
source: AudioSource;
|
||||
};
|
||||
@@ -0,0 +1,344 @@
|
||||
import { jest, describe, beforeEach, afterEach, it, expect } from '@jest/globals';
|
||||
import { resolve } from 'node:path';
|
||||
import { PassThrough } from 'node:stream';
|
||||
|
||||
import AudioManager from '../src/audio-manager';
|
||||
import { AudioManagerConfigError, AudioManagerStateError } from '../src';
|
||||
import { startFfmpeg } from '../src/ffmpeg';
|
||||
import type { AudioSource, VoiceConnectionOptions } from '../src';
|
||||
|
||||
const mockAudioPlayer = {
|
||||
play: jest.fn(),
|
||||
pause: jest.fn(),
|
||||
unpause: jest.fn(),
|
||||
stop: jest.fn(),
|
||||
};
|
||||
const mockConnection = {
|
||||
subscribe: jest.fn(),
|
||||
disconnect: jest.fn(),
|
||||
destroy: jest.fn(),
|
||||
};
|
||||
const mockAudioResource = {
|
||||
playStream: {
|
||||
destroy: jest.fn(),
|
||||
},
|
||||
volume: {
|
||||
setVolume: jest.fn(),
|
||||
},
|
||||
};
|
||||
const mockFfmpegHandle = {
|
||||
process: {
|
||||
stdout: new PassThrough(),
|
||||
},
|
||||
stop: jest.fn(),
|
||||
};
|
||||
|
||||
jest.mock('@discordjs/voice', () => ({
|
||||
NoSubscriberBehavior: {
|
||||
Play: 'play',
|
||||
},
|
||||
StreamType: {
|
||||
Raw: 'raw',
|
||||
},
|
||||
VoiceConnectionStatus: {
|
||||
Ready: 'ready',
|
||||
},
|
||||
createAudioPlayer: jest.fn(() => mockAudioPlayer),
|
||||
createAudioResource: jest.fn(() => mockAudioResource),
|
||||
entersState: jest.fn(() => Promise.resolve(mockConnection)),
|
||||
joinVoiceChannel: jest.fn(() => mockConnection),
|
||||
}));
|
||||
|
||||
jest.mock('../src/ffmpeg', () => ({
|
||||
startFfmpeg: jest.fn(() => mockFfmpegHandle),
|
||||
}));
|
||||
|
||||
const connectionOptions: VoiceConnectionOptions = {
|
||||
guildId: 'guild-id',
|
||||
channelId: 'channel-id',
|
||||
adapterCreator: jest.fn() as unknown as VoiceConnectionOptions['adapterCreator'],
|
||||
};
|
||||
|
||||
const liveStreamSource: AudioSource = {
|
||||
type: 'url',
|
||||
url: 'https://synradiode.stream.laut.fm/synradiode',
|
||||
};
|
||||
|
||||
const fileSourcePath = 'tests/audio.mp3';
|
||||
const resolvedFileSourcePath = resolve(process.cwd(), fileSourcePath);
|
||||
|
||||
describe('AudioManager', () => {
|
||||
beforeEach(() => {
|
||||
jest.clearAllMocks();
|
||||
});
|
||||
|
||||
afterEach(() => {
|
||||
jest.useRealTimers();
|
||||
});
|
||||
|
||||
it('requires connection options before connecting', async () => {
|
||||
const manager = new AudioManager({ renewIntervalMs: false });
|
||||
|
||||
await expect(manager.connect()).rejects.toThrow(AudioManagerConfigError);
|
||||
});
|
||||
|
||||
it('connects and starts playback with resolved URL source', async () => {
|
||||
const manager = new AudioManager({
|
||||
connection: connectionOptions,
|
||||
source: liveStreamSource,
|
||||
renewIntervalMs: false,
|
||||
});
|
||||
|
||||
await manager.start();
|
||||
|
||||
expect(manager.state).toBe('playing');
|
||||
expect(manager.isConnected).toBe(true);
|
||||
expect(manager.isPlaying).toBe(true);
|
||||
expect(mockConnection.subscribe).toHaveBeenCalledWith(mockAudioPlayer);
|
||||
expect(startFfmpeg).toHaveBeenCalledWith('https://synradiode.stream.laut.fm/synradiode', undefined);
|
||||
expect(mockAudioPlayer.play).toHaveBeenCalledWith(mockAudioResource);
|
||||
});
|
||||
|
||||
it('starts playback with the committed mp3 test file', async () => {
|
||||
const manager = new AudioManager({
|
||||
connection: connectionOptions,
|
||||
source: {
|
||||
type: 'file',
|
||||
path: fileSourcePath,
|
||||
},
|
||||
renewIntervalMs: false,
|
||||
});
|
||||
|
||||
await manager.start();
|
||||
|
||||
expect(startFfmpeg).toHaveBeenCalledWith(resolvedFileSourcePath, undefined);
|
||||
expect(mockAudioPlayer.play).toHaveBeenCalledWith(mockAudioResource);
|
||||
});
|
||||
|
||||
it('accepts the live stream URL as a valid source', async () => {
|
||||
const manager = new AudioManager({
|
||||
connection: connectionOptions,
|
||||
source: liveStreamSource,
|
||||
renewIntervalMs: false,
|
||||
});
|
||||
|
||||
await manager.connect();
|
||||
await manager.play();
|
||||
|
||||
expect(startFfmpeg).toHaveBeenCalledWith('https://synradiode.stream.laut.fm/synradiode', undefined);
|
||||
});
|
||||
|
||||
it('plays a source passed directly to play()', async () => {
|
||||
const manager = new AudioManager({
|
||||
connection: connectionOptions,
|
||||
renewIntervalMs: false,
|
||||
});
|
||||
|
||||
await manager.connect();
|
||||
await manager.play({
|
||||
type: 'file',
|
||||
path: fileSourcePath,
|
||||
});
|
||||
|
||||
expect(startFfmpeg).toHaveBeenCalledWith(resolvedFileSourcePath, undefined);
|
||||
expect(manager.state).toBe('playing');
|
||||
});
|
||||
|
||||
it('replaces active playback when a new source is played', async () => {
|
||||
const manager = new AudioManager({
|
||||
connection: connectionOptions,
|
||||
source: liveStreamSource,
|
||||
renewIntervalMs: false,
|
||||
});
|
||||
|
||||
await manager.start();
|
||||
await manager.play({
|
||||
type: 'file',
|
||||
path: fileSourcePath,
|
||||
});
|
||||
|
||||
expect(mockFfmpegHandle.stop).toHaveBeenCalledTimes(1);
|
||||
expect(mockAudioResource.playStream.destroy).toHaveBeenCalledTimes(1);
|
||||
expect(startFfmpeg).toHaveBeenLastCalledWith(resolvedFileSourcePath, undefined);
|
||||
});
|
||||
|
||||
it('requires an active connection before play()', async () => {
|
||||
const manager = new AudioManager({
|
||||
source: liveStreamSource,
|
||||
renewIntervalMs: false,
|
||||
});
|
||||
|
||||
await expect(manager.play()).rejects.toThrow(AudioManagerStateError);
|
||||
});
|
||||
|
||||
it('requires a source before play()', async () => {
|
||||
const manager = new AudioManager({
|
||||
connection: connectionOptions,
|
||||
renewIntervalMs: false,
|
||||
});
|
||||
|
||||
await manager.connect();
|
||||
|
||||
await expect(manager.play()).rejects.toThrow(AudioManagerConfigError);
|
||||
});
|
||||
|
||||
it('rejects invalid URL sources', async () => {
|
||||
const manager = new AudioManager({
|
||||
connection: connectionOptions,
|
||||
source: {
|
||||
type: 'url',
|
||||
url: 'not a url',
|
||||
},
|
||||
renewIntervalMs: false,
|
||||
});
|
||||
|
||||
await manager.connect();
|
||||
|
||||
await expect(manager.play()).rejects.toThrow(AudioManagerConfigError);
|
||||
});
|
||||
|
||||
it('applies initial volume only when volume support is enabled', async () => {
|
||||
const manager = new AudioManager({
|
||||
connection: connectionOptions,
|
||||
source: liveStreamSource,
|
||||
renewIntervalMs: false,
|
||||
volume: {
|
||||
enabled: true,
|
||||
initialPercent: 35,
|
||||
},
|
||||
});
|
||||
|
||||
await manager.start();
|
||||
|
||||
expect(mockAudioResource.volume.setVolume).toHaveBeenCalledWith(0.35);
|
||||
});
|
||||
|
||||
it('rejects volume changes when inline volume is disabled', () => {
|
||||
const manager = new AudioManager({ renewIntervalMs: false });
|
||||
|
||||
expect(() => manager.setVolume(50)).toThrow(AudioManagerStateError);
|
||||
});
|
||||
|
||||
it('rejects invalid volume percentages', async () => {
|
||||
const manager = new AudioManager({
|
||||
connection: connectionOptions,
|
||||
source: liveStreamSource,
|
||||
renewIntervalMs: false,
|
||||
volume: {
|
||||
enabled: true,
|
||||
},
|
||||
});
|
||||
|
||||
await manager.start();
|
||||
|
||||
expect(() => manager.setVolume(-1)).toThrow(AudioManagerConfigError);
|
||||
expect(() => manager.setVolume(101)).toThrow(AudioManagerConfigError);
|
||||
});
|
||||
|
||||
it('rejects volume changes before any resource exists', () => {
|
||||
const manager = new AudioManager({
|
||||
renewIntervalMs: false,
|
||||
volume: {
|
||||
enabled: true,
|
||||
},
|
||||
});
|
||||
|
||||
expect(() => manager.setVolume(50)).toThrow(AudioManagerStateError);
|
||||
});
|
||||
|
||||
it('pauses and resumes only from valid playback states', async () => {
|
||||
const manager = new AudioManager({
|
||||
connection: connectionOptions,
|
||||
source: liveStreamSource,
|
||||
renewIntervalMs: false,
|
||||
});
|
||||
|
||||
expect(() => manager.pause()).toThrow(AudioManagerStateError);
|
||||
|
||||
await manager.start();
|
||||
manager.pause();
|
||||
manager.resume();
|
||||
|
||||
expect(mockAudioPlayer.pause).toHaveBeenCalledTimes(1);
|
||||
expect(mockAudioPlayer.unpause).toHaveBeenCalledTimes(1);
|
||||
expect(manager.state).toBe('playing');
|
||||
});
|
||||
|
||||
it('stops playback and voice resources idempotently', async () => {
|
||||
const manager = new AudioManager({
|
||||
connection: connectionOptions,
|
||||
source: liveStreamSource,
|
||||
renewIntervalMs: false,
|
||||
});
|
||||
|
||||
await manager.start();
|
||||
await manager.stop();
|
||||
await manager.stop();
|
||||
|
||||
expect(mockFfmpegHandle.stop).toHaveBeenCalledTimes(1);
|
||||
expect(mockAudioResource.playStream.destroy).toHaveBeenCalledTimes(1);
|
||||
expect(mockConnection.destroy).toHaveBeenCalled();
|
||||
expect(manager.state).toBe('stopped');
|
||||
});
|
||||
|
||||
it('restarts playback when the renewal timer fires', async () => {
|
||||
jest.useFakeTimers();
|
||||
|
||||
const manager = new AudioManager({
|
||||
connection: connectionOptions,
|
||||
source: liveStreamSource,
|
||||
renewIntervalMs: 10_000,
|
||||
});
|
||||
const startSpy = jest.spyOn(manager, 'start').mockResolvedValue(undefined);
|
||||
|
||||
await manager.connect();
|
||||
jest.advanceTimersByTime(10_000);
|
||||
await Promise.resolve();
|
||||
|
||||
expect(startSpy).toHaveBeenCalledTimes(1);
|
||||
});
|
||||
|
||||
it('clears existing renewal timer before reconnecting', async () => {
|
||||
jest.useFakeTimers();
|
||||
|
||||
const manager = new AudioManager({
|
||||
connection: connectionOptions,
|
||||
source: liveStreamSource,
|
||||
renewIntervalMs: 10_000,
|
||||
});
|
||||
|
||||
await manager.connect();
|
||||
await manager.connect();
|
||||
|
||||
expect(jest.getTimerCount()).toBe(1);
|
||||
manager.dispose();
|
||||
expect(jest.getTimerCount()).toBe(0);
|
||||
});
|
||||
|
||||
it('blocks source and connection changes after disposal', async () => {
|
||||
const manager = new AudioManager({
|
||||
connection: connectionOptions,
|
||||
source: liveStreamSource,
|
||||
renewIntervalMs: false,
|
||||
});
|
||||
|
||||
manager.dispose();
|
||||
|
||||
expect(() => manager.setSource(liveStreamSource)).toThrow(AudioManagerStateError);
|
||||
expect(() => manager.setConnection(connectionOptions)).toThrow(AudioManagerStateError);
|
||||
});
|
||||
|
||||
it('prevents use after disposal', async () => {
|
||||
const manager = new AudioManager({
|
||||
connection: connectionOptions,
|
||||
source: liveStreamSource,
|
||||
renewIntervalMs: false,
|
||||
});
|
||||
|
||||
await manager.start();
|
||||
manager.dispose();
|
||||
|
||||
expect(() => manager.pause()).toThrow(AudioManagerStateError);
|
||||
expect(manager.state).toBe('disposed');
|
||||
});
|
||||
});
|
||||
Binary file not shown.
@@ -0,0 +1,139 @@
|
||||
import { jest, describe, beforeEach, afterEach, it, expect } from '@jest/globals';
|
||||
import { spawn } from 'node:child_process';
|
||||
|
||||
import { resolveFfmpegExecutable, startFfmpeg } from '../src/ffmpeg';
|
||||
|
||||
jest.mock('node:child_process', () => ({
|
||||
spawn: jest.fn(),
|
||||
}));
|
||||
|
||||
const mockSpawn = jest.mocked(spawn);
|
||||
|
||||
type MockChildProcess = {
|
||||
stdout: {
|
||||
destroy: jest.Mock;
|
||||
};
|
||||
stderr: {
|
||||
destroy: jest.Mock;
|
||||
resume: jest.Mock;
|
||||
};
|
||||
once: jest.Mock;
|
||||
removeAllListeners: jest.Mock;
|
||||
kill: jest.Mock;
|
||||
killed: boolean;
|
||||
exitCode: number | null;
|
||||
signalCode: NodeJS.Signals | null;
|
||||
};
|
||||
|
||||
function createMockChildProcess(): MockChildProcess {
|
||||
return {
|
||||
stdout: {
|
||||
destroy: jest.fn(),
|
||||
},
|
||||
stderr: {
|
||||
destroy: jest.fn(),
|
||||
resume: jest.fn(),
|
||||
},
|
||||
once: jest.fn(),
|
||||
removeAllListeners: jest.fn(),
|
||||
kill: jest.fn(),
|
||||
killed: false,
|
||||
exitCode: null,
|
||||
signalCode: null,
|
||||
};
|
||||
}
|
||||
|
||||
describe('ffmpeg helpers', () => {
|
||||
beforeEach(() => {
|
||||
jest.clearAllMocks();
|
||||
});
|
||||
|
||||
afterEach(() => {
|
||||
jest.useRealTimers();
|
||||
});
|
||||
|
||||
it('prefers an explicit executable path', () => {
|
||||
expect(resolveFfmpegExecutable({ executablePath: '/custom/ffmpeg' })).toBe('/custom/ffmpeg');
|
||||
});
|
||||
|
||||
it('uses the native ffmpeg binary by default', () => {
|
||||
expect(resolveFfmpegExecutable()).toBe('ffmpeg');
|
||||
expect(resolveFfmpegExecutable({ mode: 'native' })).toBe('ffmpeg');
|
||||
});
|
||||
|
||||
it('spawns ffmpeg with the default argument set', () => {
|
||||
const childProcess = createMockChildProcess();
|
||||
mockSpawn.mockReturnValue(childProcess);
|
||||
|
||||
startFfmpeg('https://synradiode.stream.laut.fm/synradiode');
|
||||
|
||||
expect(mockSpawn).toHaveBeenCalledWith(
|
||||
'ffmpeg',
|
||||
[
|
||||
'-hide_banner',
|
||||
'-loglevel',
|
||||
'error',
|
||||
'-nostdin',
|
||||
'-i',
|
||||
'https://synradiode.stream.laut.fm/synradiode',
|
||||
'-vn',
|
||||
'-f',
|
||||
's16le',
|
||||
'-ar',
|
||||
'48000',
|
||||
'-ac',
|
||||
'2',
|
||||
'pipe:1',
|
||||
],
|
||||
{ stdio: ['ignore', 'pipe', 'pipe'] },
|
||||
);
|
||||
expect(childProcess.once).toHaveBeenCalledWith('error', expect.any(Function));
|
||||
expect(childProcess.stderr.resume).toHaveBeenCalledTimes(1);
|
||||
});
|
||||
|
||||
it('uses custom executable and argument overrides when provided', () => {
|
||||
const childProcess = createMockChildProcess();
|
||||
mockSpawn.mockReturnValue(childProcess);
|
||||
|
||||
startFfmpeg('tests/audio.mp3', {
|
||||
executablePath: '/custom/ffmpeg',
|
||||
inputArgs: ['-re'],
|
||||
outputArgs: ['-f', 'wav', 'pipe:1'],
|
||||
});
|
||||
|
||||
expect(mockSpawn).toHaveBeenCalledWith(
|
||||
'/custom/ffmpeg',
|
||||
['-re', '-i', 'tests/audio.mp3', '-f', 'wav', 'pipe:1'],
|
||||
{ stdio: ['ignore', 'pipe', 'pipe'] },
|
||||
);
|
||||
});
|
||||
|
||||
it('stops a running child process and schedules a force kill fallback', () => {
|
||||
jest.useFakeTimers();
|
||||
const childProcess = createMockChildProcess();
|
||||
mockSpawn.mockReturnValue(childProcess);
|
||||
|
||||
const handle = startFfmpeg('tests/audio.mp3');
|
||||
handle.stop();
|
||||
|
||||
expect(childProcess.stdout.destroy).toHaveBeenCalledTimes(1);
|
||||
expect(childProcess.stderr.destroy).toHaveBeenCalledTimes(1);
|
||||
expect(childProcess.removeAllListeners).toHaveBeenCalledTimes(1);
|
||||
expect(childProcess.kill).toHaveBeenCalledWith('SIGTERM');
|
||||
|
||||
jest.advanceTimersByTime(2_000);
|
||||
|
||||
expect(childProcess.kill).toHaveBeenNthCalledWith(2, 'SIGKILL');
|
||||
});
|
||||
|
||||
it('does not signal a process that already exited', () => {
|
||||
const childProcess = createMockChildProcess();
|
||||
childProcess.exitCode = 0;
|
||||
mockSpawn.mockReturnValue(childProcess);
|
||||
|
||||
const handle = startFfmpeg('tests/audio.mp3');
|
||||
handle.stop();
|
||||
|
||||
expect(childProcess.kill).not.toHaveBeenCalled();
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,10 @@
|
||||
{
|
||||
"extends": "./tsconfig.json",
|
||||
"compilerOptions": {
|
||||
"declaration": true,
|
||||
"declarationMap": false,
|
||||
"emitDeclarationOnly": true,
|
||||
"rootDir": "./src"
|
||||
},
|
||||
"include": ["src/**/*.ts"]
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
{
|
||||
"extends": "./tsconfig.json",
|
||||
"include": ["src/**/*.ts"]
|
||||
"include": ["src/**/*.ts", "tests/**/*.ts", "tsup.config.ts"]
|
||||
}
|
||||
|
||||
+2
-6
@@ -2,16 +2,12 @@
|
||||
"compilerOptions": {
|
||||
"target": "ES2022",
|
||||
"lib": ["ES2022"],
|
||||
"module": "commonjs",
|
||||
"moduleResolution": "node",
|
||||
"module": "Node16",
|
||||
"moduleResolution": "node16",
|
||||
"resolveJsonModule": true,
|
||||
"types": [],
|
||||
"rootDir": "./",
|
||||
"outDir": "./dist",
|
||||
"baseUrl": "./",
|
||||
"paths": {
|
||||
"@/*": ["src/*"]
|
||||
},
|
||||
"esModuleInterop": true,
|
||||
"allowSyntheticDefaultImports": true,
|
||||
"forceConsistentCasingInFileNames": true,
|
||||
|
||||
@@ -0,0 +1,8 @@
|
||||
{
|
||||
"extends": "./tsconfig.json",
|
||||
"compilerOptions": {
|
||||
"isolatedModules": true,
|
||||
"outDir": "./dist-test"
|
||||
},
|
||||
"include": ["src/**/*.ts", "tests/**/*.ts", "tsup.config.ts"]
|
||||
}
|
||||
+1
-1
@@ -3,7 +3,7 @@ import { defineConfig } from 'tsup';
|
||||
export default defineConfig({
|
||||
format: ['cjs', 'esm'],
|
||||
entry: ['./src/index.ts'],
|
||||
dts: true,
|
||||
dts: false,
|
||||
shims: true,
|
||||
skipNodeModulesBundle: true,
|
||||
clean: true,
|
||||
|
||||
Reference in New Issue
Block a user