Skip to content

Commit d71e0d3

Browse files
committed
fixes
1 parent 47b234a commit d71e0d3

File tree

1 file changed

+10
-9
lines changed

1 file changed

+10
-9
lines changed

src/module.ts

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ import { defu } from 'defu'
33
import { generateDeveloperToken } from './runtime/server/utils/musicKit'
44

55
// Module options TypeScript interface definition
6-
type ModuleOptions = {
7-
clientModeOnly: boolean;
6+
export type ModuleOptions = {
7+
clientModeOnly?: boolean;
88
appName: string;
99
appBuild: string;
1010
devTokenUrl?: string;
11+
developerKey?: string;
1112
teamID?: string;
1213
keyID?: string;
13-
developerKey?: string;
1414
};
1515

1616
declare global {
@@ -53,12 +53,6 @@ export default defineNuxtModule<ModuleOptions>({
5353
nuxt.options.runtimeConfig.musicKit = defu(nuxt.options.runtimeConfig.musicKit || {}, options)
5454
const musicKitOptions = nuxt.options.runtimeConfig.musicKit as ModuleOptions
5555

56-
if (musicKitOptions.devTokenUrl && !musicKitOptions.devTokenUrl.startsWith('http://') && !musicKitOptions.devTokenUrl.startsWith('https://')) {
57-
addServerHandler({
58-
route: musicKitOptions.devTokenUrl,
59-
handler: resolver.resolve('./runtime/server/api/token'),
60-
})
61-
}
6256
if (musicKitOptions.clientModeOnly && musicKitOptions.devTokenUrl) {
6357
try {
6458
const response = await fetch(musicKitOptions.devTokenUrl);
@@ -74,6 +68,13 @@ export default defineNuxtModule<ModuleOptions>({
7468
} else if (musicKitOptions.developerKey && musicKitOptions.teamID && musicKitOptions.keyID) {
7569
try {
7670
token = await generateDeveloperToken(musicKitOptions.developerKey, musicKitOptions.teamID, musicKitOptions.keyID);
71+
if (musicKitOptions.devTokenUrl && !musicKitOptions.devTokenUrl.startsWith('http://') && !musicKitOptions.devTokenUrl.startsWith('https://')) {
72+
addServerHandler({
73+
route: musicKitOptions.devTokenUrl,
74+
handler: resolver.resolve('./runtime/server/api/token'),
75+
})
76+
}
77+
7778
} catch (error) {
7879
console.warn('Failed to generate Apple Music developer token:', error);
7980
console.warn('MusicKit functionality will be limited without a valid token');

0 commit comments

Comments
 (0)