@bzenky/spoti 0.4.0 → 0.5.0

package/dist/spotify/client.js

@@ -1,6 +1,19 @@
 import { AppError, AuthenticationRequiredError, NoActiveDeviceError, PremiumRequiredError, RateLimitedError, SpotifyApiError, toError, } from '../utils/errors.js';
+import { sanitizeOneLineText } from '../utils/text.js';
 const API_BASE_URL = 'https://api.spotify.com/v1';
 const MAX_RATE_LIMIT_RETRIES = 3;
+const PLAYBACK_CONTROL_REQUESTS = new Set([
+    'PUT /me/player',
+    'PUT /me/player/play',
+    'PUT /me/player/pause',
+    'POST /me/player/next',
+    'POST /me/player/previous',
+    'PUT /me/player/seek',
+    'PUT /me/player/repeat',
+    'PUT /me/player/volume',
+    'PUT /me/player/shuffle',
+    'POST /me/player/queue',
+]);
 const sleep = (milliseconds) => new Promise((resolve) => setTimeout(resolve, milliseconds));
 export class SpotifyClient {
     authService;
@@ -35,83 +48,194 @@ export class SpotifyClient {
             headers.set('Content-Type', 'application/json');
             body = JSON.stringify(options.body);
         }
-        const execute = async (token) => {
-            headers.set('Authorization', `Bearer ${token}`);
+        throwIfExternallyAborted(options.signal);
+        let accessToken = await this.authService.getAccessToken();
+        let refreshedToken = false;
+        let rateLimitRetries = 0;
+        while (true) {
+            throwIfExternallyAborted(options.signal);
+            headers.set('Authorization', `Bearer ${accessToken}`);
+            const attempt = createAttemptSignal(options.signal);
+            let shouldRefreshToken = false;
+            let retryDelayMs;
             try {
-                return await this.fetcher(url, {
+                const response = await this.fetcher(url, {
                     method,
                     headers,
-                    signal: AbortSignal.timeout(15_000),
+                    signal: attempt.signal,
                     ...(body === undefined ? {} : { body }),
                 });
+                if (response.status === 401 && !refreshedToken) {
+                    shouldRefreshToken = true;
+                }
+                else if (response.status === 429 &&
+                    rateLimitRetries < MAX_RATE_LIMIT_RETRIES) {
+                    const retryAfterSeconds = getRetryAfterSeconds(response);
+                    const exponentialBackoffMs = 500 * 2 ** rateLimitRetries;
+                    rateLimitRetries += 1;
+                    retryDelayMs = Math.max(retryAfterSeconds * 1_000, exponentialBackoffMs);
+                }
+                else {
+                    if (!response.ok) {
+                        const mappedError = await mapSpotifyError(response, method, path);
+                        throwIfAttemptAborted(attempt.signal, options.signal);
+                        throw mappedError;
+                    }
+                    if (response.status === 204)
+                        return undefined;
+                    const text = await response.text();
+                    throwIfAttemptAborted(attempt.signal, options.signal);
+                    if (!text)
+                        return undefined;
+                    const contentType = response.headers.get('content-type')?.toLocaleLowerCase() ?? '';
+                    if (!contentType.includes('json')) {
+                        if (method !== 'GET')
+                            return undefined;
+                        throw new SpotifyApiError('Spotify returned an unexpected non-JSON response.', response.status);
+                    }
+                    try {
+                        return JSON.parse(text);
+                    }
+                    catch {
+                        throw new SpotifyApiError('Spotify returned malformed JSON.', response.status);
+                    }
+                }
             }
             catch (error) {
-                const normalizedError = toError(error);
-                if (normalizedError.name === 'TimeoutError') {
-                    throw new AppError('Spotify did not respond within 15 seconds. Try again.');
-                }
-                throw new AppError(`Unable to reach Spotify: ${normalizedError.message}`);
+                throw normalizeAttemptError(error, attempt.signal, options.signal);
             }
-        };
-        let accessToken = await this.authService.getAccessToken();
-        let refreshedToken = false;
-        let rateLimitRetries = 0;
-        let response;
-        while (true) {
-            response = await execute(accessToken);
-            if (response.status === 401 && !refreshedToken) {
+            finally {
+                attempt.cleanup();
+            }
+            if (shouldRefreshToken) {
+                throwIfExternallyAborted(options.signal);
                 accessToken = await this.authService.forceRefreshAccessToken();
                 refreshedToken = true;
                 continue;
             }
-            if (response.status === 429 && rateLimitRetries < MAX_RATE_LIMIT_RETRIES) {
-                const retryAfterMs = getRetryAfterMilliseconds(response);
-                const exponentialBackoffMs = 500 * 2 ** rateLimitRetries;
-                rateLimitRetries += 1;
-                await this.sleeper(Math.max(retryAfterMs, exponentialBackoffMs));
+            if (retryDelayMs !== undefined) {
+                await this.waitForRetry(retryDelayMs, options.signal);
                 continue;
             }
-            break;
         }
-        if (!response.ok)
-            throw await mapSpotifyError(response);
-        if (response.status === 204)
-            return undefined;
-        const text = await response.text();
-        if (!text)
-            return undefined;
-        const contentType = response.headers.get('content-type')?.toLocaleLowerCase() ?? '';
-        if (!contentType.includes('json')) {
-            if (method !== 'GET')
-                return undefined;
-            throw new SpotifyApiError('Spotify returned an unexpected non-JSON response.', response.status);
+    }
+    async waitForRetry(milliseconds, signal) {
+        throwIfExternallyAborted(signal);
+        if (!signal) {
+            await this.sleeper(milliseconds);
+            return;
+        }
+        if (this.sleeper === sleep) {
+            await abortableSleep(milliseconds, signal);
+            return;
         }
+        let abortListener;
+        const aborted = new Promise((_resolve, reject) => {
+            abortListener = () => reject(getExternalAbortReason(signal));
+            signal.addEventListener('abort', abortListener, { once: true });
+            if (signal.aborted)
+                abortListener();
+        });
         try {
-            return JSON.parse(text);
+            await Promise.race([this.sleeper(milliseconds), aborted]);
         }
-        catch {
-            throw new SpotifyApiError('Spotify returned malformed JSON.', response.status);
+        finally {
+            if (abortListener)
+                signal.removeEventListener('abort', abortListener);
         }
     }
 }
-function getRetryAfterMilliseconds(response) {
-    const seconds = Number(response.headers.get('retry-after'));
-    return Number.isFinite(seconds) && seconds >= 0 ? seconds * 1_000 : 0;
+function createAttemptSignal(externalSignal) {
+    const controller = new AbortController();
+    const abortFromExternalSignal = () => {
+        if (externalSignal)
+            controller.abort(getExternalAbortReason(externalSignal));
+    };
+    externalSignal?.addEventListener('abort', abortFromExternalSignal, { once: true });
+    if (externalSignal?.aborted)
+        abortFromExternalSignal();
+    const timeout = setTimeout(() => controller.abort(new DOMException('The operation timed out.', 'TimeoutError')), 15_000);
+    timeout.unref();
+    let cleanedUp = false;
+    return {
+        signal: controller.signal,
+        cleanup: () => {
+            if (cleanedUp)
+                return;
+            cleanedUp = true;
+            clearTimeout(timeout);
+            externalSignal?.removeEventListener('abort', abortFromExternalSignal);
+        },
+    };
+}
+function normalizeAttemptError(error, attemptSignal, externalSignal) {
+    if (externalSignal?.aborted)
+        return getExternalAbortReason(externalSignal);
+    const normalizedError = toError(error);
+    if (normalizedError.name === 'TimeoutError' ||
+        (attemptSignal.aborted && toError(attemptSignal.reason).name === 'TimeoutError')) {
+        return new AppError('Spotify did not respond within 15 seconds. Try again.');
+    }
+    if (normalizedError instanceof AppError)
+        return normalizedError;
+    return new AppError(`Unable to reach Spotify: ${sanitizeOneLineText(normalizedError.message)}`);
+}
+function throwIfAttemptAborted(attemptSignal, externalSignal) {
+    throwIfExternallyAborted(externalSignal);
+    if (attemptSignal.aborted)
+        throw attemptSignal.reason;
 }
-async function mapSpotifyError(response) {
+function throwIfExternallyAborted(signal) {
+    if (signal?.aborted)
+        throw getExternalAbortReason(signal);
+}
+function getExternalAbortReason(signal) {
+    const reason = signal.reason;
+    if (reason instanceof Error && reason.name === 'AbortError')
+        return reason;
+    return new DOMException('The operation was aborted.', 'AbortError');
+}
+function abortableSleep(milliseconds, signal) {
+    return new Promise((resolve, reject) => {
+        const timer = setTimeout(() => {
+            signal.removeEventListener('abort', abortListener);
+            resolve();
+        }, milliseconds);
+        const abortListener = () => {
+            clearTimeout(timer);
+            reject(getExternalAbortReason(signal));
+        };
+        signal.addEventListener('abort', abortListener, { once: true });
+        if (signal.aborted)
+            abortListener();
+    });
+}
+function getRetryAfterSeconds(response) {
+    const header = response.headers.get('retry-after');
+    if (header === null)
+        return 1;
+    const seconds = Number(header);
+    if (!Number.isFinite(seconds) || seconds < 0)
+        return 1;
+    return Math.ceil(seconds);
+}
+async function mapSpotifyError(response, method, path) {
     const body = await readErrorBody(response);
     const spotifyMessage = typeof body.error === 'object' ? body.error?.message : body.error_description;
-    const message = spotifyMessage || `Spotify API request failed with HTTP ${response.status}.`;
+    const sanitizedMessage = spotifyMessage ? sanitizeOneLineText(spotifyMessage) : '';
+    const message = sanitizedMessage || `Spotify API request failed with HTTP ${response.status}.`;
     if (response.status === 401) {
         return new AuthenticationRequiredError('Spotify authentication has expired or was revoked.\n\nRun: spoti login');
     }
     if (response.status === 403 && /premium/i.test(message))
         return new PremiumRequiredError();
-    if (response.status === 404 && /device/i.test(message))
+    if (response.status === 404 &&
+        PLAYBACK_CONTROL_REQUESTS.has(`${method} ${path}`) &&
+        /\b(?:no active device|device not found)\b/i.test(message)) {
         return new NoActiveDeviceError();
+    }
     if (response.status === 429) {
-        const retryAfter = Number(response.headers.get('retry-after') ?? '1');
-        return new RateLimitedError(Number.isFinite(retryAfter) ? retryAfter : 1);
+        return new RateLimitedError(getRetryAfterSeconds(response));
     }
     return new SpotifyApiError(message, response.status);
 }

package/dist/spotify/client.js.map

@@ -1 +1 @@
-{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/spotify/client.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/spotify/client.ts"],"names":[],"mappings":"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"}

package/dist/spotify/types.d.ts

@@ -122,6 +122,8 @@ export interface SpotifyCursorPaging<T> {
 }
 export interface SpotifyPlaybackState {
     is_playing: boolean;
+    repeat_state: string;
+    shuffle_state: boolean;
     progress_ms: number | null;
     item: SpotifyPlaybackItem | null;
     device: {

package/dist/ui/completions.js

@@ -77,16 +77,16 @@ _spoti() {
     'seek:seek within the current track'
     'volume:set or adjust the active device volume'
     'queue:show the playback queue or add a searched track'
-    'shuffle:turn playback shuffle on or off'
-    'repeat:set the playback repeat mode'
+    'shuffle:show or change the playback shuffle state'
+    'repeat:show or change the playback repeat mode'
     'album:search for and show an album'
     'artist:search for and show an artist'
-    'playlists:list your Spotify playlists'
+    'playlists:list and optionally play your Spotify playlists'
     'playlist:show one of your Spotify playlists'
-    'liked:list your liked tracks'
+    'liked:list and optionally play your liked tracks'
     'like:add the current track to your Spotify library'
     'unlike:remove the current track from your Spotify library'
-    'recent:show recently played tracks'
+    'recent:show and optionally play recently played tracks'
     'update:check for or install the latest spoti version'
     'search:search Spotify tracks'
     'play:play a track, album, artist, or playlist'
@@ -191,16 +191,16 @@ complete -c spoti -n __spoti_needs_command -a device -d 'Transfer playback to a
 complete -c spoti -n __spoti_needs_command -a seek -d 'Seek within the current track'
 complete -c spoti -n __spoti_needs_command -a volume -d 'Set or adjust volume'
 complete -c spoti -n __spoti_needs_command -a queue -d 'Show or add to the queue'
-complete -c spoti -n __spoti_needs_command -a shuffle -d 'Turn shuffle on or off'
-complete -c spoti -n __spoti_needs_command -a repeat -d 'Set repeat mode'
+complete -c spoti -n __spoti_needs_command -a shuffle -d 'Show or change playback shuffle state'
+complete -c spoti -n __spoti_needs_command -a repeat -d 'Show or change playback repeat mode'
 complete -c spoti -n __spoti_needs_command -a album -d 'Search for an album'
 complete -c spoti -n __spoti_needs_command -a artist -d 'Search for an artist'
-complete -c spoti -n __spoti_needs_command -a playlists -d 'List your playlists'
+complete -c spoti -n __spoti_needs_command -a playlists -d 'List and optionally play your playlists'
 complete -c spoti -n __spoti_needs_command -a playlist -d 'Show a playlist'
-complete -c spoti -n __spoti_needs_command -a liked -d 'List liked tracks'
+complete -c spoti -n __spoti_needs_command -a liked -d 'List and optionally play liked tracks'
 complete -c spoti -n __spoti_needs_command -a like -d 'Like the current track'
 complete -c spoti -n __spoti_needs_command -a unlike -d 'Unlike the current track'
-complete -c spoti -n __spoti_needs_command -a recent -d 'Show recently played tracks'
+complete -c spoti -n __spoti_needs_command -a recent -d 'Show and optionally play recently played tracks'
 complete -c spoti -n __spoti_needs_command -a update -d 'Check for or install updates'
 complete -c spoti -n __spoti_needs_command -a search -d 'Search Spotify tracks'
 complete -c spoti -n __spoti_needs_command -a play -d 'Play a track, album, artist, or playlist'

package/dist/ui/interactive-search.d.ts

@@ -1,5 +1,6 @@
 import type { PlayerService } from '../services/player.service.js';
 import type { SearchService } from '../services/search.service.js';
+import { type OutputStyles } from './output.js';
 export type SearchCategory = 'track' | 'album' | 'artist' | 'playlist';
 export type InteractiveSearchKey = {
     type: 'character';
@@ -11,7 +12,7 @@ export interface InteractiveSearchTerminal {
     readonly isTTY: boolean;
     setup(): void;
     cleanup(): void;
-    readKey(): Promise<InteractiveSearchKey>;
+    readKey(signal?: AbortSignal): Promise<InteractiveSearchKey>;
     write(value: string): void;
 }
 export interface InteractiveSearchServices {
@@ -21,6 +22,7 @@ export interface InteractiveSearchServices {
 export interface InteractiveSearchOptions extends InteractiveSearchServices {
     terminal?: InteractiveSearchTerminal;
     limit?: number;
+    styles?: OutputStyles;
 }
 export type InteractiveSearchResult = {
     status: 'not-interactive' | 'cancelled';
@@ -28,6 +30,7 @@ export type InteractiveSearchResult = {
     status: 'played';
     category: SearchCategory;
     uri: string;
+    label: string;
 };
 export declare function runInteractiveSearch(options: InteractiveSearchOptions): Promise<InteractiveSearchResult>;
 export declare function createNodeInteractiveSearchTerminal(): InteractiveSearchTerminal;