@bzenky/spoti 0.1.0 → 0.3.0

package/dist/services/update.service.js

@@ -0,0 +1,313 @@
+import { spawn } from 'node:child_process';
+import { FileUpdateCacheStore, } from '../storage/update-cache.js';
+export const SPOTI_PACKAGE_NAME = '@bzenky/spoti';
+export const NPM_REGISTRY_URL = 'https://registry.npmjs.org/%40bzenky%2Fspoti';
+export const UPDATE_CHECK_INTERVAL_MS = 24 * 60 * 60 * 1_000;
+export const UPDATE_CHECK_TIMEOUT_MS = 3_000;
+export const UPDATE_COMMAND = 'npm install -g @bzenky/spoti@latest';
+export class UpdateCheckError extends Error {
+    constructor(message, options) {
+        super(message, options);
+        this.name = 'UpdateCheckError';
+    }
+}
+export class UpdateInstallError extends Error {
+    constructor(message, options) {
+        super(message, options);
+        this.name = 'UpdateInstallError';
+    }
+}
+export class UpdateService {
+    currentVersion;
+    cache;
+    fetchImplementation;
+    clock;
+    timeoutMs;
+    checkIntervalMs;
+    commandRunner;
+    constructor(currentVersion, dependencies = {}) {
+        this.currentVersion = currentVersion;
+        parseSemanticVersion(currentVersion);
+        this.cache = dependencies.cache ?? new FileUpdateCacheStore();
+        this.fetchImplementation = dependencies.fetch ?? globalThis.fetch;
+        this.clock = dependencies.now ?? Date.now;
+        this.timeoutMs = dependencies.timeoutMs ?? UPDATE_CHECK_TIMEOUT_MS;
+        this.checkIntervalMs = dependencies.checkIntervalMs ?? UPDATE_CHECK_INTERVAL_MS;
+        this.commandRunner = dependencies.commandRunner ?? new NodeUpdateCommandRunner();
+        if (!Number.isFinite(this.timeoutMs) || this.timeoutMs <= 0) {
+            throw new RangeError('Update check timeout must be a positive number.');
+        }
+        if (!Number.isFinite(this.checkIntervalMs) || this.checkIntervalMs <= 0) {
+            throw new RangeError('Update check interval must be a positive number.');
+        }
+    }
+    /** Always contacts npm and reports actionable failures. Intended for `spoti update --check`. */
+    async checkForeground() {
+        const checkedAt = this.clock();
+        try {
+            const result = await this.fetchLatest(checkedAt);
+            await this.cache.write(successCache(result));
+            return result;
+        }
+        catch (error) {
+            await this.recordFailedCheck(checkedAt);
+            if (error instanceof UpdateCheckError)
+                throw error;
+            throw new UpdateCheckError(`Unable to check for updates: ${errorMessage(error)}`, {
+                cause: error,
+            });
+        }
+    }
+    /** Uses the 24-hour cache and hides failures so normal commands remain unaffected. */
+    async checkInBackground() {
+        const now = this.clock();
+        try {
+            const cached = await this.cache.read();
+            if (cached && isFresh(cached.lastCheckedAt, now, this.checkIntervalMs)) {
+                if (cached.lastFailedCheckAt === cached.lastCheckedAt)
+                    return null;
+                if (cached.lastSuccessfulCheck?.currentVersion === this.currentVersion) {
+                    try {
+                        return resultFromSuccessfulCache(cached.lastSuccessfulCheck);
+                    }
+                    catch {
+                        // Invalid cached versions are recoverable; refresh them from the registry.
+                    }
+                }
+            }
+            try {
+                const result = await this.fetchLatest(now);
+                await this.cache.write(successCache(result, cached));
+                return result;
+            }
+            catch {
+                await this.recordFailedCheck(now, cached);
+                return null;
+            }
+        }
+        catch {
+            return null;
+        }
+    }
+    /** The caller must obtain explicit user confirmation before setting `confirmed` to true. */
+    async installLatest(confirmed, version) {
+        if (!confirmed) {
+            throw new UpdateInstallError(`Update not installed because confirmation is required. To update manually, run: ${UPDATE_COMMAND}`);
+        }
+        try {
+            parseSemanticVersion(version);
+        }
+        catch (error) {
+            throw new UpdateInstallError(`Refusing to install invalid version ${JSON.stringify(version)}.`, {
+                cause: error,
+            });
+        }
+        try {
+            await this.commandRunner.run('npm', [
+                'install',
+                '--global',
+                `${SPOTI_PACKAGE_NAME}@${version}`,
+            ]);
+        }
+        catch (error) {
+            throw new UpdateInstallError(`Unable to install the latest spoti version: ${errorMessage(error)}\n\nRun manually: ${UPDATE_COMMAND}`, { cause: error });
+        }
+    }
+    async fetchLatest(checkedAt) {
+        const controller = new AbortController();
+        const timeout = setTimeout(() => controller.abort(), this.timeoutMs);
+        timeout.unref?.();
+        let response;
+        try {
+            response = await this.fetchImplementation(NPM_REGISTRY_URL, {
+                headers: { accept: 'application/vnd.npm.install-v1+json' },
+                signal: controller.signal,
+            });
+        }
+        catch (error) {
+            if (controller.signal.aborted || isAbortError(error)) {
+                throw new UpdateCheckError(`Update check timed out after ${this.timeoutMs}ms. Check your network connection and try again.`, { cause: error });
+            }
+            throw new UpdateCheckError(`Unable to reach the npm registry: ${errorMessage(error)}. Check your network connection and try again.`, { cause: error });
+        }
+        finally {
+            clearTimeout(timeout);
+        }
+        if (!response.ok) {
+            throw new UpdateCheckError(`The npm registry returned HTTP ${response.status}${response.statusText ? ` ${response.statusText}` : ''}. Try again later.`);
+        }
+        let metadata;
+        try {
+            metadata = await response.json();
+        }
+        catch (error) {
+            throw new UpdateCheckError('The npm registry returned malformed JSON. Try again later or check the npm registry status.', { cause: error });
+        }
+        const latestVersion = readLatestVersion(metadata);
+        let comparison;
+        try {
+            comparison = compareSemanticVersions(latestVersion, this.currentVersion);
+        }
+        catch (error) {
+            throw new UpdateCheckError(`The npm registry returned an invalid latest version (${JSON.stringify(latestVersion)}). Try again later.`, { cause: error });
+        }
+        return {
+            status: comparison > 0 ? 'update-available' : 'current',
+            currentVersion: this.currentVersion,
+            latestVersion,
+            checkedAt,
+            source: 'registry',
+        };
+    }
+    async recordFailedCheck(at, previous) {
+        let cache = previous;
+        if (cache === undefined) {
+            try {
+                cache = await this.cache.read();
+            }
+            catch {
+                cache = null;
+            }
+        }
+        await this.cache
+            .write({
+            version: 1,
+            lastCheckedAt: at,
+            ...(cache?.lastSuccessfulCheck
+                ? { lastSuccessfulCheck: cache.lastSuccessfulCheck }
+                : {}),
+            lastFailedCheckAt: at,
+        })
+            .catch(() => undefined);
+    }
+}
+export class NodeUpdateCommandRunner {
+    run(command, args) {
+        return new Promise((resolve, reject) => {
+            const child = spawn(command, [...args], { stdio: 'inherit', shell: false });
+            child.once('error', reject);
+            child.once('exit', (code, signal) => {
+                if (code === 0) {
+                    resolve();
+                    return;
+                }
+                reject(new Error(signal
+                    ? `npm was terminated by signal ${signal}`
+                    : `npm exited with status ${String(code)}`));
+            });
+        });
+    }
+}
+export function compareSemanticVersions(left, right) {
+    const leftVersion = parseSemanticVersion(left);
+    const rightVersion = parseSemanticVersion(right);
+    for (const key of ['major', 'minor', 'patch']) {
+        const comparison = compareNumericIdentifiers(leftVersion[key], rightVersion[key]);
+        if (comparison !== 0)
+            return comparison;
+    }
+    if (!leftVersion.prerelease && !rightVersion.prerelease)
+        return 0;
+    if (!leftVersion.prerelease)
+        return 1;
+    if (!rightVersion.prerelease)
+        return -1;
+    const length = Math.max(leftVersion.prerelease.length, rightVersion.prerelease.length);
+    for (let index = 0; index < length; index += 1) {
+        const leftIdentifier = leftVersion.prerelease[index];
+        const rightIdentifier = rightVersion.prerelease[index];
+        if (leftIdentifier === undefined)
+            return -1;
+        if (rightIdentifier === undefined)
+            return 1;
+        if (leftIdentifier === rightIdentifier)
+            continue;
+        const leftNumeric = /^\d+$/.test(leftIdentifier);
+        const rightNumeric = /^\d+$/.test(rightIdentifier);
+        if (leftNumeric && rightNumeric) {
+            return compareNumericIdentifiers(leftIdentifier, rightIdentifier);
+        }
+        if (leftNumeric)
+            return -1;
+        if (rightNumeric)
+            return 1;
+        return leftIdentifier < rightIdentifier ? -1 : 1;
+    }
+    return 0;
+}
+const SEMANTIC_VERSION_PATTERN = /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[A-Za-z-][0-9A-Za-z-]*)(?:\.(?:0|[1-9]\d*|\d*[A-Za-z-][0-9A-Za-z-]*))*))?(?:\+[0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*)?$/;
+function parseSemanticVersion(value) {
+    const match = SEMANTIC_VERSION_PATTERN.exec(value);
+    if (!match) {
+        throw new TypeError(`Invalid semantic version: ${JSON.stringify(value)}`);
+    }
+    const major = match[1];
+    const minor = match[2];
+    const patch = match[3];
+    if (major === undefined || minor === undefined || patch === undefined) {
+        throw new TypeError(`Invalid semantic version: ${JSON.stringify(value)}`);
+    }
+    const prerelease = match[4];
+    return {
+        major,
+        minor,
+        patch,
+        ...(prerelease === undefined ? {} : { prerelease: prerelease.split('.') }),
+    };
+}
+function compareNumericIdentifiers(left, right) {
+    if (left.length !== right.length)
+        return left.length < right.length ? -1 : 1;
+    if (left === right)
+        return 0;
+    return left < right ? -1 : 1;
+}
+function readLatestVersion(metadata) {
+    if (typeof metadata !== 'object' ||
+        metadata === null ||
+        !('dist-tags' in metadata) ||
+        typeof metadata['dist-tags'] !== 'object' ||
+        metadata['dist-tags'] === null ||
+        !('latest' in metadata['dist-tags']) ||
+        typeof metadata['dist-tags'].latest !== 'string' ||
+        metadata['dist-tags'].latest.length === 0) {
+        throw new UpdateCheckError('The npm registry response did not include a latest version. Try again later.');
+    }
+    return metadata['dist-tags'].latest;
+}
+function successCache(result, previous) {
+    return {
+        version: 1,
+        lastCheckedAt: result.checkedAt,
+        lastSuccessfulCheck: {
+            checkedAt: result.checkedAt,
+            currentVersion: result.currentVersion,
+            latestVersion: result.latestVersion,
+        },
+        ...(previous?.lastFailedCheckAt === undefined
+            ? {}
+            : { lastFailedCheckAt: previous.lastFailedCheckAt }),
+    };
+}
+function resultFromSuccessfulCache(cache) {
+    return {
+        status: compareSemanticVersions(cache.latestVersion, cache.currentVersion) > 0
+            ? 'update-available'
+            : 'current',
+        currentVersion: cache.currentVersion,
+        latestVersion: cache.latestVersion,
+        checkedAt: cache.checkedAt,
+        source: 'cache',
+    };
+}
+function isFresh(checkedAt, now, intervalMs) {
+    const age = now - checkedAt;
+    return age >= 0 && age < intervalMs;
+}
+function isAbortError(error) {
+    return error instanceof Error && error.name === 'AbortError';
+}
+function errorMessage(error) {
+    return error instanceof Error ? error.message : String(error);
+}
+//# sourceMappingURL=update.service.js.map

package/dist/services/update.service.js.map

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

package/dist/spotify/client.js

@@ -78,7 +78,20 @@ export class SpotifyClient {
         if (response.status === 204)
             return undefined;
         const text = await response.text();
-        return (text ? JSON.parse(text) : undefined);
+        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);
+        }
     }
 }
 function getRetryAfterMilliseconds(response) {

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":"AAAA,OAAO,EACL,QAAQ,EACR,2BAA2B,EAC3B,mBAAmB,EACnB,oBAAoB,EACpB,gBAAgB,EAChB,eAAe,EACf,OAAO,GACR,MAAM,oBAAoB,CAAC;AAG5B,MAAM,YAAY,GAAG,4BAA4B,CAAC;AAClD,MAAM,sBAAsB,GAAG,CAAC,CAAC;AAIjC,MAAM,KAAK,GAAU,CAAC,YAAY,EAAE,EAAE,CACpC,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC;AAmB9D,MAAM,OAAO,aAAa;IAEL;IACA;IACA;IAHnB,YACmB,WAAgC,EAChC,UAAwB,KAAK,EAC7B,UAAiB,KAAK;QAFtB,gBAAW,GAAX,WAAW,CAAqB;QAChC,YAAO,GAAP,OAAO,CAAsB;QAC7B,YAAO,GAAP,OAAO,CAAe;IACtC,CAAC;IAEJ,GAAG,CAAI,IAAY,EAAE,OAAwB;QAC3C,OAAO,IAAI,CAAC,OAAO,CAAI,KAAK,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;IAC/C,CAAC;IAED,IAAI,CAAI,IAAY,EAAE,OAAwB;QAC5C,OAAO,IAAI,CAAC,OAAO,CAAI,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;IAChD,CAAC;IAED,GAAG,CAAI,IAAY,EAAE,OAAwB;QAC3C,OAAO,IAAI,CAAC,OAAO,CAAI,KAAK,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;IAC/C,CAAC;IAED,MAAM,CAAI,IAAY,EAAE,OAAwB;QAC9C,OAAO,IAAI,CAAC,OAAO,CAAI,QAAQ,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;IAClD,CAAC;IAEO,KAAK,CAAC,OAAO,CACnB,MAAc,EACd,IAAY,EACZ,UAA0B,EAAE;QAE5B,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,GAAG,YAAY,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,EAAE,CAAC,CAAC;QAClF,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,IAAI,EAAE,CAAC,EAAE,CAAC;YAC/D,IAAI,KAAK,KAAK,SAAS;gBAAE,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;QACpE,CAAC;QAED,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;QAC9B,IAAI,IAAwB,CAAC;QAC7B,IAAI,OAAO,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YAC/B,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,kBAAkB,CAAC,CAAC;YAChD,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACtC,CAAC;QAED,MAAM,OAAO,GAAG,KAAK,EAAE,KAAa,EAAqB,EAAE;YACzD,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,UAAU,KAAK,EAAE,CAAC,CAAC;YAChD,IAAI,CAAC;gBACH,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE;oBAC7B,MAAM;oBACN,OAAO;oBACP,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC;oBACnC,GAAG,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC;iBACxC,CAAC,CAAC;YACL,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,eAAe,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;gBACvC,IAAI,eAAe,CAAC,IAAI,KAAK,cAAc,EAAE,CAAC;oBAC5C,MAAM,IAAI,QAAQ,CAAC,uDAAuD,CAAC,CAAC;gBAC9E,CAAC;gBACD,MAAM,IAAI,QAAQ,CAAC,4BAA4B,eAAe,CAAC,OAAO,EAAE,CAAC,CAAC;YAC5E,CAAC;QACH,CAAC,CAAC;QAEF,IAAI,WAAW,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,cAAc,EAAE,CAAC;QAC1D,IAAI,cAAc,GAAG,KAAK,CAAC;QAC3B,IAAI,gBAAgB,GAAG,CAAC,CAAC;QACzB,IAAI,QAAkB,CAAC;QAEvB,OAAO,IAAI,EAAE,CAAC;YACZ,QAAQ,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC,CAAC;YACtC,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;gBAC/C,WAAW,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,uBAAuB,EAAE,CAAC;gBAC/D,cAAc,GAAG,IAAI,CAAC;gBACtB,SAAS;YACX,CAAC;YACD,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,IAAI,gBAAgB,GAAG,sBAAsB,EAAE,CAAC;gBACzE,MAAM,YAAY,GAAG,yBAAyB,CAAC,QAAQ,CAAC,CAAC;gBACzD,MAAM,oBAAoB,GAAG,GAAG,GAAG,CAAC,IAAI,gBAAgB,CAAC;gBACzD,gBAAgB,IAAI,CAAC,CAAC;gBACtB,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,YAAY,EAAE,oBAAoB,CAAC,CAAC,CAAC;gBACjE,SAAS;YACX,CAAC;YACD,MAAM;QACR,CAAC;QAED,IAAI,CAAC,QAAQ,CAAC,EAAE;YAAE,MAAM,MAAM,eAAe,CAAC,QAAQ,CAAC,CAAC;QACxD,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG;YAAE,OAAO,SAAc,CAAC;QAEnD,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;QACnC,IAAI,CAAC,IAAI;YAAE,OAAO,SAAc,CAAC;QAEjC,MAAM,WAAW,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC;QACpF,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;YAClC,IAAI,MAAM,KAAK,KAAK;gBAAE,OAAO,SAAc,CAAC;YAC5C,MAAM,IAAI,eAAe,CACvB,mDAAmD,EACnD,QAAQ,CAAC,MAAM,CAChB,CAAC;QACJ,CAAC;QAED,IAAI,CAAC;YACH,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAM,CAAC;QAC/B,CAAC;QAAC,MAAM,CAAC;YACP,MAAM,IAAI,eAAe,CAAC,kCAAkC,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;QACjF,CAAC;IACH,CAAC;CACF;AAED,SAAS,yBAAyB,CAAC,QAAkB;IACnD,MAAM,OAAO,GAAG,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC;IAC5D,OAAO,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,OAAO,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;AACxE,CAAC;AAED,KAAK,UAAU,eAAe,CAAC,QAAkB;IAC/C,MAAM,IAAI,GAAG,MAAM,aAAa,CAAC,QAAQ,CAAC,CAAC;IAC3C,MAAM,cAAc,GAClB,OAAO,IAAI,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC;IAChF,MAAM,OAAO,GAAG,cAAc,IAAI,wCAAwC,QAAQ,CAAC,MAAM,GAAG,CAAC;IAE7F,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;QAC5B,OAAO,IAAI,2BAA2B,CACpC,wEAAwE,CACzE,CAAC;IACJ,CAAC;IACD,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,IAAI,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC;QAAE,OAAO,IAAI,oBAAoB,EAAE,CAAC;IAC3F,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,IAAI,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC;QAAE,OAAO,IAAI,mBAAmB,EAAE,CAAC;IACzF,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;QAC5B,MAAM,UAAU,GAAG,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,IAAI,GAAG,CAAC,CAAC;QACtE,OAAO,IAAI,gBAAgB,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC5E,CAAC;IACD,OAAO,IAAI,eAAe,CAAC,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;AACvD,CAAC;AAED,KAAK,UAAU,aAAa,CAAC,QAAkB;IAC7C,IAAI,CAAC;QACH,OAAO,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAqB,CAAC;IACrD,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC"}

package/dist/spotify/scopes.d.ts

@@ -1 +1,2 @@
-export declare const SPOTIFY_SCOPES: readonly ["user-read-playback-state", "user-modify-playback-state"];
+export declare const LEGACY_SPOTIFY_SCOPES: readonly ["user-read-playback-state", "user-modify-playback-state"];
+export declare const SPOTIFY_SCOPES: readonly ["user-read-playback-state", "user-modify-playback-state", "user-read-currently-playing", "playlist-read-private", "user-library-read", "user-library-modify", "user-read-recently-played"];

package/dist/spotify/scopes.js

@@ -1,5 +1,13 @@
-export const SPOTIFY_SCOPES = [
+export const LEGACY_SPOTIFY_SCOPES = [
     'user-read-playback-state',
     'user-modify-playback-state',
 ];
+export const SPOTIFY_SCOPES = [
+    ...LEGACY_SPOTIFY_SCOPES,
+    'user-read-currently-playing',
+    'playlist-read-private',
+    'user-library-read',
+    'user-library-modify',
+    'user-read-recently-played',
+];
 //# sourceMappingURL=scopes.js.map

package/dist/spotify/scopes.js.map

@@ -1 +1 @@
-{"version":3,"file":"scopes.js","sourceRoot":"","sources":["../../src/spotify/scopes.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,cAAc,GAAG;IAC5B,0BAA0B;IAC1B,4BAA4B;CACpB,CAAC"}
+{"version":3,"file":"scopes.js","sourceRoot":"","sources":["../../src/spotify/scopes.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,qBAAqB,GAAG;IACnC,0BAA0B;IAC1B,4BAA4B;CACpB,CAAC;AAEX,MAAM,CAAC,MAAM,cAAc,GAAG;IAC5B,GAAG,qBAAqB;IACxB,6BAA6B;IAC7B,uBAAuB;IACvB,mBAAmB;IACnB,qBAAqB;IACrB,2BAA2B;CACnB,CAAC"}

package/dist/spotify/types.d.ts

@@ -3,6 +3,9 @@ export interface SpotifyImage {
     height: number | null;
     width: number | null;
 }
+export interface SpotifyExternalUrls {
+    spotify?: string;
+}
 export interface SpotifyUserProfile {
     id: string;
     display_name: string | null;
@@ -10,37 +13,138 @@ export interface SpotifyUserProfile {
 }
 export interface SpotifyArtist {
     id: string;
+    uri?: string;
+    name: string;
+    external_urls?: SpotifyExternalUrls;
+}
+export interface SpotifyFullArtist extends SpotifyArtist {
+    uri: string;
+    images: SpotifyImage[];
+}
+export interface SpotifySimplifiedAlbum {
+    id?: string;
+    uri?: string;
     name: string;
+    album_type?: string;
+    artists?: SpotifyArtist[];
+    images: SpotifyImage[];
+    release_date?: string;
+    total_tracks?: number;
+    external_urls?: SpotifyExternalUrls;
 }
 export interface SpotifyTrack {
-    id: string;
+    type?: 'track';
+    id: string | null;
     uri: string;
     name: string;
     duration_ms: number;
     artists: SpotifyArtist[];
-    album: {
-        name: string;
-        images: SpotifyImage[];
+    album: SpotifySimplifiedAlbum;
+    is_local?: boolean;
+    is_playable?: boolean;
+    external_urls?: SpotifyExternalUrls;
+}
+export interface SpotifySimplifiedTrack {
+    type?: 'track';
+    id: string | null;
+    uri: string;
+    name: string;
+    duration_ms: number;
+    artists: SpotifyArtist[];
+    is_local?: boolean;
+    is_playable?: boolean;
+    external_urls?: SpotifyExternalUrls;
+}
+export interface SpotifyAlbum extends SpotifySimplifiedAlbum {
+    id: string;
+    uri: string;
+    artists: SpotifyArtist[];
+    tracks: SpotifyPaging<SpotifySimplifiedTrack>;
+}
+export interface SpotifyPlaylistOwner {
+    id: string;
+    display_name: string | null;
+}
+export interface SpotifySimplifiedPlaylist {
+    id: string;
+    uri: string;
+    name: string;
+    description: string | null;
+    public: boolean | null;
+    collaborative: boolean;
+    owner: SpotifyPlaylistOwner;
+    images: SpotifyImage[] | null;
+    external_urls?: SpotifyExternalUrls;
+    items: {
+        total: number;
     };
-    external_urls?: {
-        spotify?: string;
+}
+export interface SpotifyPlaylist extends SpotifySimplifiedPlaylist {
+    followers?: {
+        total: number;
+    };
+}
+export interface SpotifyEpisode {
+    type: 'episode';
+    id?: string | null;
+    uri?: string;
+    name?: string;
+}
+export type SpotifyPlaybackItem = SpotifyTrack | SpotifyEpisode | Record<string, unknown>;
+export interface SpotifyPlaylistItem {
+    added_at: string | null;
+    is_local: boolean;
+    item: SpotifyPlaybackItem | null;
+}
+export interface SpotifyRecentlyPlayedItem {
+    track: SpotifyPlaybackItem | null;
+    played_at: string;
+    context: {
+        uri: string;
+    } | null;
+}
+export interface SpotifyPaging<T> {
+    items: T[];
+    limit: number;
+    offset: number;
+    total: number;
+    next: string | null;
+    previous: string | null;
+}
+export interface SpotifyCursorPaging<T> {
+    items: T[];
+    limit: number;
+    next: string | null;
+    cursors?: {
+        after?: string;
+        before?: string;
     };
 }
 export interface SpotifyPlaybackState {
     is_playing: boolean;
     progress_ms: number | null;
-    item: SpotifyTrack | null;
+    item: SpotifyPlaybackItem | null;
     device: {
         id: string | null;
         name: string;
         is_active: boolean;
+        volume_percent: number | null;
+        supports_volume: boolean;
     };
 }
 export interface SpotifySearchResponse {
-    tracks: {
+    tracks?: SpotifyPaging<SpotifyTrack> | {
         items: SpotifyTrack[];
     };
+    albums?: SpotifyPaging<SpotifySimplifiedAlbum>;
+    artists?: SpotifyPaging<SpotifyFullArtist>;
+    playlists?: SpotifyPaging<SpotifySimplifiedPlaylist | null>;
+}
+export interface SpotifySavedTrack {
+    added_at: string;
+    track: SpotifyTrack;
 }
+export type SpotifyRecentlyPlayedResponse = SpotifyCursorPaging<SpotifyRecentlyPlayedItem>;
 export interface SpotifyErrorBody {
     error?: {
         status?: number;

package/dist/storage/config.d.ts

@@ -0,0 +1,30 @@
+import { z } from 'zod';
+declare const configSchema: z.ZodObject<{
+    spotifyClientId: z.ZodDefault<z.ZodNullable<z.ZodString>>;
+    watchAfterPlay: z.ZodDefault<z.ZodBoolean>;
+    refreshIntervalMs: z.ZodDefault<z.ZodNumber>;
+}, z.core.$strict>;
+export type AppConfig = z.infer<typeof configSchema>;
+export declare const CONFIG_KEYS: readonly ["spotifyClientId", "watchAfterPlay", "refreshIntervalMs"];
+export type ConfigKey = (typeof CONFIG_KEYS)[number];
+export declare const DEFAULT_CONFIG: Readonly<AppConfig>;
+export interface ConfigStore {
+    read(): Promise<AppConfig>;
+    write(config: AppConfig): Promise<void>;
+    set<Key extends ConfigKey>(key: Key, value: AppConfig[Key]): Promise<void>;
+    reset(): Promise<void>;
+}
+export interface FileConfigStoreOptions {
+    directory?: string;
+}
+export declare class FileConfigStore implements ConfigStore {
+    readonly path: string;
+    private readonly directory;
+    constructor(options?: FileConfigStoreOptions);
+    read(): Promise<AppConfig>;
+    write(config: AppConfig): Promise<void>;
+    set<Key extends ConfigKey>(key: Key, value: AppConfig[Key]): Promise<void>;
+    reset(): Promise<void>;
+}
+export declare function parseConfigValue<Key extends ConfigKey>(key: Key, value: string): AppConfig[Key];
+export {};