mirror of
https://github.com/kilyabin/psysonic.git
synced 2026-07-21 22:15:40 +00:00
6118b3940f
* feat(server): probe AudioMuse via OpenSubsonic and add PsyLab Connections tab Navidrome ≥0.62: detect sonicSimilarity extension for reliable plugin signal; older servers keep the legacy getSimilarSongs probe. PsyLab gets a Connections tab with session, endpoint, and active-server capability details. * feat(psylab): polish Connections tab, admin role probe, and tab bar layout Status badges and Navidrome admin/user validation in Connections; prevent PsyLab tab row from vertically collapsing under the Logs flex layout. * docs: add CHANGELOG and credits for PR #1032 * feat(settings): auto-enable AudioMuse on Navidrome 0.62+ with status indicator Replace the per-server manual toggle with a probe-driven badge when sonicSimilarity is available; pre-0.62 Navidrome keeps the legacy toggle. * feat(server): capability framework with AudioMuse sonic routing Add a declarative server-capability catalog (src/serverCapabilities/) that picks a feature strategy per server generation, runs only the needed probes, and routes API calls. AudioMuse Instant Mix now prefers the OpenSubsonic sonicSimilarity endpoint (getSonicSimilarTracks) on Navidrome 0.62+ and falls back to legacy getSimilarSongs. - catalog/context/resolve: eligibility, detection, activation, call routing - storeView: read facade over the existing per-server probe maps - getSonicSimilarTracks API client + fetchSimilarTracksRouted router - route Instant Mix and Lucky Mix through the resolver - ServersTab + PsyLab Connections read the resolver (auto status vs toggle) - tests: resolve, storeView, router * docs: update CHANGELOG and credits for PR #1033 Renamed branch supersedes PR #1032: point changelog/credits at #1033 and document the server-capability framework, auto-managed AudioMuse indicator, and sonic Instant Mix routing. * refactor(server): address PR #1033 review — idempotent probe, drop dead code - Make scheduleInstantMixProbeForServer idempotent: skip when a definitive result is cached; re-probe only on force (add/edit/test server), a prior error, or a server version/type change (invalidated in setSubsonicServerIdentity). Removes the steady-state 120 s re-probe, the present→probing→present flicker, and the momentary legacy-fallback routing window. - Remove now-dead identity helpers (showAudiomuseNavidromeServerSetting, isAudiomusePluginAutoManaged, isNavidromeSonicSimilarityEligible, resolveAudiomusePluginProbeUiStatus + type) and the superseded probeAudiomusePluginWithCredentials; the catalog is the single source of truth. - Drop the never-emitted 'unsupported' AudiomusePluginProbeResult variant. - Fill audiomuseStatus* keys in all 8 non-en locales. - Tests: probe idempotency + version-change invalidation; retarget OpenSubsonic test to fetchOpenSubsonicExtensionsWithCredentials.
166 lines
6.0 KiB
TypeScript
166 lines
6.0 KiB
TypeScript
import axios from 'axios';
|
||
import md5 from 'md5';
|
||
import { useAuthStore } from '../store/authStore';
|
||
import {
|
||
type InstantMixProbeResult,
|
||
type SubsonicServerIdentity,
|
||
} from '../utils/server/subsonicServerIdentity';
|
||
import { fetchOpenSubsonicExtensionsWithCredentials } from './subsonicOpenSubsonic';
|
||
import { buildCapabilityContext } from '../serverCapabilities/context';
|
||
import {
|
||
PROBE_LEGACY_INSTANT_MIX,
|
||
PROBE_OPENSUBSONIC_EXTENSIONS,
|
||
SERVER_CAPABILITY_CATALOG,
|
||
SONIC_SIMILARITY_EXTENSION,
|
||
} from '../serverCapabilities/catalog';
|
||
import { neededProbeIds } from '../serverCapabilities/resolve';
|
||
import {
|
||
SUBSONIC_CLIENT,
|
||
api,
|
||
apiWithCredentials,
|
||
secureRandomSalt,
|
||
} from './subsonicClient';
|
||
import type { PingWithCredentialsResult, SubsonicSong } from './subsonicTypes';
|
||
|
||
export async function ping(): Promise<boolean> {
|
||
try {
|
||
await api('ping.view');
|
||
return true;
|
||
} catch {
|
||
return false;
|
||
}
|
||
}
|
||
|
||
|
||
/** Test a connection with explicit credentials — does NOT depend on store state. */
|
||
export async function pingWithCredentials(
|
||
serverUrl: string,
|
||
username: string,
|
||
password: string,
|
||
): Promise<PingWithCredentialsResult> {
|
||
try {
|
||
const base = serverUrl.startsWith('http') ? serverUrl.replace(/\/$/, '') : `http://${serverUrl.replace(/\/$/, '')}`;
|
||
const salt = secureRandomSalt();
|
||
const token = md5(password + salt);
|
||
const resp = await axios.get(`${base}/rest/ping.view`, {
|
||
params: { u: username, t: token, s: salt, v: '1.16.1', c: SUBSONIC_CLIENT, f: 'json' },
|
||
paramsSerializer: { indexes: null },
|
||
timeout: 15000,
|
||
});
|
||
const data = resp.data?.['subsonic-response'];
|
||
const ok = data?.status === 'ok';
|
||
return {
|
||
ok,
|
||
type: typeof data?.type === 'string' ? data.type : undefined,
|
||
serverVersion: typeof data?.serverVersion === 'string' ? data.serverVersion : undefined,
|
||
openSubsonic: data?.openSubsonic === true,
|
||
};
|
||
} catch (err) {
|
||
console.warn('[psysonic] pingWithCredentials failed:', serverUrl, err);
|
||
return { ok: false };
|
||
}
|
||
}
|
||
|
||
const INSTANT_MIX_PROBE_RANDOM_SIZE = 8;
|
||
const INSTANT_MIX_PROBE_SIMILAR_COUNT = 12;
|
||
const INSTANT_MIX_PROBE_MAX_TRACKS = 4;
|
||
|
||
/**
|
||
* Probes whether `getSimilarSongs` returns any tracks (Instant Mix / Navidrome agent chain).
|
||
* Does not pass `musicFolderId` — probes the whole library as seen by the account.
|
||
* Note: if `ND_AGENTS` includes Last.fm, a positive result does not prove AudioMuse alone.
|
||
*/
|
||
export async function probeInstantMixWithCredentials(
|
||
serverUrl: string,
|
||
username: string,
|
||
password: string,
|
||
): Promise<InstantMixProbeResult> {
|
||
try {
|
||
const data = await apiWithCredentials<{ randomSongs: { song: SubsonicSong | SubsonicSong[] } }>(
|
||
serverUrl,
|
||
username,
|
||
password,
|
||
'getRandomSongs.view',
|
||
{ size: INSTANT_MIX_PROBE_RANDOM_SIZE, _t: Date.now() },
|
||
12000,
|
||
);
|
||
const raw = data.randomSongs?.song;
|
||
const songs: SubsonicSong[] = !raw ? [] : Array.isArray(raw) ? raw : [raw];
|
||
if (songs.length === 0) return 'skipped';
|
||
|
||
let anyError = false;
|
||
for (const song of songs.slice(0, INSTANT_MIX_PROBE_MAX_TRACKS)) {
|
||
try {
|
||
const simData = await apiWithCredentials<{ similarSongs: { song: SubsonicSong | SubsonicSong[] } }>(
|
||
serverUrl,
|
||
username,
|
||
password,
|
||
'getSimilarSongs.view',
|
||
{ id: song.id, count: INSTANT_MIX_PROBE_SIMILAR_COUNT },
|
||
12000,
|
||
);
|
||
const sRaw = simData.similarSongs?.song;
|
||
const list: SubsonicSong[] = !sRaw ? [] : Array.isArray(sRaw) ? sRaw : [sRaw];
|
||
if (list.some(s => s.id !== song.id)) return 'ok';
|
||
} catch {
|
||
anyError = true;
|
||
}
|
||
}
|
||
return anyError ? 'error' : 'empty';
|
||
} catch {
|
||
return 'error';
|
||
}
|
||
}
|
||
|
||
/**
|
||
* After a successful ping, run the server-capability probes needed by the catalog
|
||
* (`serverCapabilities/`). Which probes run is decided by the strategies eligible
|
||
* for this server generation — not by inline version checks here.
|
||
*
|
||
* Currently: Navidrome ≥ 0.62 → `getOpenSubsonicExtensions` (sonicSimilarity);
|
||
* Navidrome 0.60–0.61 → legacy `getSimilarSongs` Instant Mix probe.
|
||
*
|
||
* Idempotent: a server's advertised capabilities are static within a session, so
|
||
* once a definitive result is cached the probe is skipped. This is called on every
|
||
* 120 s connection poll, so re-fetching each time would be wasteful and would flip
|
||
* the resolved status (and the routed endpoint) through a `probing` window. Pass
|
||
* `force` for user-initiated refreshes (add/edit/test server); a server version or
|
||
* type change clears the cache (see `setSubsonicServerIdentity`), forcing a re-probe.
|
||
*/
|
||
export function scheduleInstantMixProbeForServer(
|
||
serverId: string,
|
||
serverUrl: string,
|
||
username: string,
|
||
password: string,
|
||
identity: SubsonicServerIdentity,
|
||
force = false,
|
||
): void {
|
||
const ctx = buildCapabilityContext(identity);
|
||
const probeIds = neededProbeIds(SERVER_CAPABILITY_CATALOG, ctx);
|
||
const store = useAuthStore.getState();
|
||
|
||
if (probeIds.has(PROBE_OPENSUBSONIC_EXTENSIONS)) {
|
||
const cached = store.audiomusePluginProbeByServer[serverId];
|
||
// Re-probe only without a definitive cached result (or on force / prior error).
|
||
// `probing` means an in-flight fetch — skip to avoid a duplicate request.
|
||
if (force || cached === undefined || cached === 'error') {
|
||
store.setAudiomusePluginProbe(serverId, 'probing');
|
||
void fetchOpenSubsonicExtensionsWithCredentials(serverUrl, username, password).then(extensions => {
|
||
const result = extensions === null
|
||
? 'error'
|
||
: extensions.includes(SONIC_SIMILARITY_EXTENSION) ? 'present' : 'absent';
|
||
useAuthStore.getState().setAudiomusePluginProbe(serverId, result);
|
||
});
|
||
}
|
||
}
|
||
|
||
if (probeIds.has(PROBE_LEGACY_INSTANT_MIX)) {
|
||
const cached = store.instantMixProbeByServer[serverId];
|
||
if (force || cached === undefined || cached === 'error') {
|
||
void probeInstantMixWithCredentials(serverUrl, username, password).then(result =>
|
||
useAuthStore.getState().setInstantMixProbe(serverId, result),
|
||
);
|
||
}
|
||
}
|
||
}
|