Merge pull request #1764 from nukeop/feat/19-02-2025

Fix #1710

Author: nukeop

.github/copilot-instructions.md

@@ -1,9 +1,22 @@
-This is a music player made with Typescript, React, Electron, and some Rust. You are a superhuman-level AI specializing in these technologies.
+You are an AI programming assistant integrated with your code editor. Your avatar and online persona are that of a cute Japanese anime girl named Nuki. You may refer to yourself in the third person sometimes. You are helping with the development of a music player app called Nuclear. At all times, play the role of Nuki.
+
+Your personality: creative, fun, energetic, cute, witty, savage, sarcastic, snarky, and smart.
+
+# Project info
+
+Nuclear is a free software music player for Linux, Mac, and Windows. It's made with Typescript, React, Electron, and some Rust. It's structured as a monorepo with multiple packages under `<root>/packages`:
+
+- app: The application in the renderer process. It's a React app built with Webpack. Uses SCSS for styles.
+- core: The core logic of the music player, that can be used in other packages. Any shared logic should go there.
+- ui: Reusable UI components for the app. Written in React and SCSS. Contains snapshot tests for most of the components.
+- i18n: Internationalization logic for the app. Contains mostly just strings and translation for various languages, so you likely won't have to interact with it directly.
+- main: The main process of the Electron app. It uses inversify to separate the logic into services and controllers. You should stick to this pattern and suggest to the developer to do the same.
+- scanner: A Rust package that scans and indexes the user's music library and sends the data to the app package.
 
 # Key principles
 
 - Use modern React and Typescript style. Prioritize readability over "clever" code.
-- Always write the complete code for every step. Don't ad placeholders, todos, or other missing pieces.
+- Always write the complete code for every step. Don't add placeholders, todos, or other missing pieces.
 - Use functional and declarative programming patterns, avoid classes and mutable state.
 - Use descriptive variable names with auxiliary verbs (e.g. `isPlaying`, `isPaused`, `hasError`).
 - Structure files according to the conventions you see in the existing code.

package-lock.json

@@ -55,7 +55,7 @@
     "7zip-bin-mac": "^1.0.1"
   },
   "engines": {
-    "node": ">=20.0.0",
+    "node": ">=22.0.0",
     "npm": ">=10.0.0"
   },
   "husky": {

package.json

@@ -99,12 +99,12 @@ class App extends React.PureComponent {
   }
 
   scrobbleLastFm() {
-    const currentSong = this.props.queue.queueItems[
-      this.props.queue.currentSong
+    const currentTrack = this.props.queue.queueItems[
+      this.props.queue.currentTrack
     ];
     this.props.actions.updateNowPlayingAction(
-      currentSong.artist,
-      currentSong.name,
+      currentTrack.artist,
+      currentTrack.name,
       this.props.scrobbling.lastFmSessionKey
     );
   }
@@ -126,9 +126,9 @@ class App extends React.PureComponent {
     );
   }
 
-  getCurrentSongParameter(parameter) {
-    return this.props.queue.queueItems[this.props.queue.currentSong]
-      ? this.props.queue.queueItems[this.props.queue.currentSong][parameter]
+  getCurrentTrackParameter(parameter) {
+    return this.props.queue.queueItems[this.props.queue.currentTrack]
+      ? this.props.queue.queueItems[this.props.queue.currentTrack][parameter]
       : null;
   }
 

packages/app/app/App.js

@@ -1,12 +1,13 @@
+import StreamProviderPlugin from '@nuclear/core/src/plugins/streamProvider';
 import { QueueItem } from '../reducers/queue';
 import { Queue } from './actionTypes';
-import * as QueueOperations from './queue';
+import * as QueueActions from './queue';
 
 describe('Queue actions tests', () => {
 
   describe('finds streams for track', () => {
-    const getSelectedStreamProvider = jest.spyOn(QueueOperations, 'getSelectedStreamProvider');
-    const resolveTrackStreams = jest.spyOn(QueueOperations, 'resolveTrackStreams');
+    const getSelectedStreamProvider = jest.spyOn(QueueActions, 'getSelectedStreamProvider');
+    const resolveTrackStreams = jest.spyOn(QueueActions, 'resolveTrackStreams');
 
     afterEach(() => {
       getSelectedStreamProvider.mockReset();
@@ -18,7 +19,7 @@ describe('Queue actions tests', () => {
       resolveTrackStreams.mockResolvedValueOnce([]);
 
       // Configure a dummy stream provider. It is not actually used in this execution path.
-      getSelectedStreamProvider.mockReturnValueOnce({});
+      getSelectedStreamProvider.mockReturnValueOnce({} as StreamProviderPlugin);
 
       // Set up the queue with an arbitrary track, which doesn't have any stream.
       const trackIndex = 123;
@@ -39,7 +40,7 @@ describe('Queue actions tests', () => {
       });
 
       const dispatchOperation = jest.fn();
-      const findStreamsForTrackOperation = QueueOperations.findStreamsForTrack(trackIndex);
+      const findStreamsForTrackOperation = QueueActions.findStreamsForTrack(trackIndex, 'stream lookup error');
       findStreamsForTrackOperation(dispatchOperation, stateResolver)
         .then(() => {
           // The track without streams should have been removed from the queue.