NoBuffer - Fix STALL handling on first load

plugins/LastFM/src/index.ts

@@ -16,7 +16,7 @@ import { debounce } from "@inrixia/lib/debounce";
 import safeUnload from "@inrixia/lib/safeUnload";
 
 import { settings } from "./Settings";
-import currentPlaybackContext from "@inrixia/lib/currentPlaybackContext";
+import getPlaybackControl from "@inrixia/lib/getPlaybackControl";
 export { Settings } from "./Settings";
 
 let totalPlayTime = 0;
@@ -131,7 +131,7 @@ type CurrentTrack = {
 const getCurrentTrack = async (playbackContext?: PlaybackContext): Promise<CurrentTrack> => {
 	const playbackStart = Date.now();
 
-	playbackContext = currentPlaybackContext();
+	playbackContext ??= getPlaybackControl()?.playbackContext;
 	if (playbackContext === undefined) throw new Error("PlaybackContext is undefined");
 	const extTrackItem = await ExtendedTrackItem.current(playbackContext);
 	if (extTrackItem === undefined) throw new Error("Failed to get extTrackItem");

plugins/NoBuffer/src/index.ts

@@ -1,4 +1,4 @@
-import { intercept } from "@neptune";
+import { intercept, store } from "@neptune";
 import { TrackItemCache } from "@inrixia/lib/Caches/TrackItemCache";
 
 import { fetchTrack } from "@inrixia/lib/trackBytes/download";
@@ -7,15 +7,15 @@ import * as stream from "stream";
 const { Writable } = <typeof stream>require("stream");
 
 import { Tracer } from "@inrixia/lib/trace";
-import currentPlaybackContext from "@inrixia/lib/currentPlaybackContext";
+import getPlaybackControl from "@inrixia/lib/getPlaybackControl";
 const trace = Tracer("[NoBuffer]");
 
 let unblocking = false;
 export const onUnload = intercept("playbackControls/SET_PLAYBACK_STATE", ([state]) => {
-	if (state === "STALLED" && unblocking === false) {
+	const { playbackContext, latestCurrentTime } = getPlaybackControl();
+	if (latestCurrentTime !== 0 && state === "STALLED" && unblocking === false) {
 		unblocking = true;
 		(async () => {
-			const playbackContext = currentPlaybackContext();
 			if (playbackContext === undefined) return;
 			const trackItem = await TrackItemCache.current(playbackContext);
 			if (trackItem === undefined) return;

plugins/_lib/Caches/ExtendedTrackItem.ts

@@ -7,7 +7,7 @@ import { TrackItemCache } from "./TrackItemCache";
 import { AlbumCache } from "./AlbumCache";
 import { libTrace } from "../trace";
 import { store } from "@neptune";
-import currentPlaybackContext from "../currentPlaybackContext";
+import getPlaybackControl from "../getPlaybackControl";
 
 export class ExtendedTrackItem {
 	private _album?: Album;
@@ -18,7 +18,7 @@ export class ExtendedTrackItem {
 	private constructor(public readonly trackId: ItemId, public readonly trackItem: TrackItem) {}
 
 	public static current(playbackContext?: PlaybackContext) {
-		playbackContext ??= currentPlaybackContext();
+		playbackContext ??= getPlaybackControl()?.playbackContext;
 		if (playbackContext?.actualProductId === undefined) return undefined;
 		return this.get(playbackContext.actualProductId);
 	}

plugins/_lib/Caches/TrackItemCache.ts

@@ -2,12 +2,12 @@ import { store } from "@neptune";
 import type { TrackItem, MediaItem, ItemId } from "neptune-types/tidal";
 import { interceptPromise } from "../intercept/interceptPromise";
 import type { PlaybackContext } from "../AudioQualityTypes";
-import currentPlaybackContext from "../currentPlaybackContext";
+import getPlaybackControl from "../getPlaybackControl";
 
 export class TrackItemCache {
 	private static readonly _cache: Record<ItemId, TrackItem> = {};
 	public static current(playbackContext?: PlaybackContext) {
-		playbackContext ??= currentPlaybackContext();
+		playbackContext ??= getPlaybackControl()?.playbackContext;
 		if (playbackContext?.actualProductId === undefined) return undefined;
 		return this.ensure(playbackContext.actualProductId);
 	}

plugins/_lib/getPlaybackControl.ts

@@ -0,0 +1,6 @@
+import { store } from "@neptune";
+import { PlaybackContext } from "./AudioQualityTypes";
+import type { CoreState } from "neptune-types/tidal";
+
+type PlaybackControl = CoreState["playbackControls"] & { playbackContext: PlaybackContext };
+export default (): Partial<PlaybackControl> => <PlaybackControl>store.getState()?.playbackControls ?? {};