add initial files

.dockerignore

@@ -0,0 +1,4 @@
+node_modules
+release/app/node_modules
+release/app/dist
+src/server/node_modules

.erb/configs/webpack.config.base.ts

@@ -5,7 +5,6 @@
 import webpack from 'webpack';
 import { dependencies as externals } from '../../release/app/package.json';
 import webpackPaths from './webpack.paths';
-import { TsconfigPathsPlugin } from 'tsconfig-paths-webpack-plugin';
 
 const configuration: webpack.Configuration = {
   externals: [...Object.keys(externals || {})],
@@ -49,7 +48,6 @@ const configuration: webpack.Configuration = {
     fallback: {
       child_process: false,
     },
-    plugins: [new TsconfigPathsPlugin({ baseUrl: webpackPaths.srcPath })],
     modules: [webpackPaths.srcPath, 'node_modules'],
   },
 

.erb/configs/webpack.config.renderer.dev.ts

@@ -22,16 +22,21 @@ if (process.env.NODE_ENV === 'production') {
 const port = process.env.PORT || 4343;
 const manifest = path.resolve(webpackPaths.dllPath, 'renderer.json');
 // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-const requiredByDLLConfig = module.parent!.filename.includes('webpack.config.renderer.dev.dll');
+const requiredByDLLConfig = module.parent!.filename.includes(
+  'webpack.config.renderer.dev.dll'
+);
 
 /**
  * Warn if the DLL is not built
  */
-if (!requiredByDLLConfig && !(fs.existsSync(webpackPaths.dllPath) && fs.existsSync(manifest))) {
+if (
+  !requiredByDLLConfig &&
+  !(fs.existsSync(webpackPaths.dllPath) && fs.existsSync(manifest))
+) {
   console.log(
     chalk.black.bgYellow.bold(
-      'The DLL files are missing. Sit back while we build them for you with "npm run build-dll"',
-    ),
+      'The DLL files are missing. Sit back while we build them for you with "npm run build-dll"'
+    )
   );
   execSync('npm run postinstall');
 }

.eslintrc.js

@@ -1,27 +1,18 @@
 module.exports = {
   extends: ['erb', 'plugin:typescript-sort-keys/recommended'],
-  ignorePatterns: ['.erb/*', 'server'],
-  parser: '@typescript-eslint/parser',
   parserOptions: {
     createDefaultProgram: true,
-    ecmaVersion: 12,
-    parser: '@typescript-eslint/parser',
+    ecmaVersion: 2020,
     project: './tsconfig.json',
     sourceType: 'module',
-    tsconfigRootDir: './',
+    tsconfigRootDir: __dirname,
   },
-  plugins: ['@typescript-eslint', 'import', 'sort-keys-fix'],
+  plugins: ['import', 'sort-keys-fix'],
   rules: {
-    '@typescript-eslint/naming-convention': 'off',
     '@typescript-eslint/no-explicit-any': 'off',
     '@typescript-eslint/no-non-null-assertion': 'off',
-    '@typescript-eslint/no-shadow': ['off'],
-    'default-case': 'off',
-    'import/extensions': 'off',
-    'import/no-absolute-path': 'off',
     // A temporary hack related to IDE not resolving correct package.json
     'import/no-extraneous-dependencies': 'off',
-
     'import/no-unresolved': 'error',
     'import/order': [
       'error',
@@ -50,8 +41,6 @@ module.exports = {
     'no-console': 'off',
     'no-nested-ternary': 'off',
     'no-restricted-syntax': 'off',
-    'no-underscore-dangle': 'off',
-    'prefer-destructuring': 'off',
     'react/jsx-props-no-spreading': 'off',
     'react/jsx-sort-props': [
       'error',
@@ -64,9 +53,8 @@ module.exports = {
         shorthandLast: false,
       },
     ],
-    'react/no-array-index-key': 'off',
+    // Since React 17 and typescript 4.1 you can safely disable the rule
     'react/react-in-jsx-scope': 'off',
-    'react/require-default-props': 'off',
     'sort-keys-fix/sort-keys-fix': 'warn',
   },
   settings: {
@@ -78,10 +66,7 @@ module.exports = {
       node: {
         extensions: ['.js', '.jsx', '.ts', '.tsx'],
       },
-      typescript: {
-        alwaysTryTypes: true,
-        project: './tsconfig.json',
-      },
+      typescript: {},
       webpack: {
         config: require.resolve('./.erb/configs/webpack.config.eslint.ts'),
       },

.github/FUNDING.yml

@@ -1 +1,5 @@
 # These are supported funding model platforms
+
+github: [electron-react-boilerplate, amilajack]
+patreon: amilajack
+open_collective: electron-react-boilerplate-594

.github/workflows/publish.yml

@@ -1,9 +1,16 @@
-name: Publish (Manual)
+name: Publish
 
-on: workflow_dispatch
+on:
+  push:
+    branches:
+      - main
 
 jobs:
   publish:
+    # To enable auto publishing to github, update your electron publisher
+    # config in package.json > "build" and remove the conditional below
+    if: ${{ github.repository_owner == 'electron-react-boilerplate' }}
+
     runs-on: ${{ matrix.os }}
 
     strategy:
@@ -26,14 +33,14 @@ jobs:
 
       - name: Publish releases
         env:
+          # These values are used for auto updates signing
+          APPLE_ID: ${{ secrets.APPLE_ID }}
+          APPLE_ID_PASS: ${{ secrets.APPLE_ID_PASS }}
+          CSC_LINK: ${{ secrets.CSC_LINK }}
+          CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
+          # This is used for uploading release assets to github
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        uses: nick-invision/retry@v2.8.2
-        with:
-          timeout_minutes: 30
-          max_attempts: 3
-          retry_on: error
-          command: |
-            npm run postinstall
-            npm run build
-            npm exec electron-builder -- --publish always --win --mac --linux
-          on_retry_command: npm cache clean --force
+        run: |
+          npm run postinstall
+          npm run build
+          npm exec electron-builder -- --publish always --win --mac --linux

.prettierrc

@@ -1,20 +1,8 @@
 {
-  "printWidth": 100,
+  "trailingComma": "es5",
+  "tabWidth": 2,
   "semi": true,
   "singleQuote": true,
-  "overrides": [
-    {
-      "files": ["**/*.css", "**/*.scss", "**/*.html"],
-      "options": {
-        "singleQuote": false
-      }
-    }
-  ],
-  "trailingComma": "all",
-  "bracketSpacing": true,
-  "arrowParens": "always",
-  "proseWrap": "never",
-  "htmlWhitespaceSensitivity": "strict",
-  "endOfLine": "lf",
-  "singleAttributePerLine": true
+  "printWidth": 100,
+  "arrowParens": "always"
 }

.stylelintrc.json

@@ -17,9 +17,6 @@
         "empty-line-between-groups": false
       }
     ],
-    "string-quotes": "single",
-    "declaration-block-no-redundant-longhand-properties": null,
-    "selector-class-pattern": null,
     "selector-type-case": ["lower", { "ignoreTypes": ["/^\\$\\w+/"] }],
     "selector-type-no-unknown": [
       true,

.vscode/settings.json

@@ -4,11 +4,6 @@
     ".prettierrc": "jsonc",
     ".eslintignore": "ignore"
   },
-  "eslint.validate": ["typescript"],
-  "eslint.workingDirectories": [
-    { "directory": "./", "changeProcessCWD": true },
-    { "directory": "./server", "changeProcessCWD": true }
-  ],
   "typescript.tsserver.experimental.enableProjectDiagnostics": true,
   "editor.tabSize": 2,
   "editor.codeActionsOnSave": {
@@ -31,13 +26,5 @@
     "test/**/__snapshots__": true,
     "package-lock.json": true,
     "*.{css,sass,scss}.d.ts": true
-  },
-  "i18n-ally.localesPaths": ["src/i18n", "src/i18n/locales"],
-  "typescript.tsdk": "node_modules\\typescript\\lib",
-  "typescript.preferences.importModuleSpecifier": "non-relative",
-  "stylelint.validate": ["css", "less", "postcss", "typescript", "typescriptreact", "scss"],
-  "typescript.updateImportsOnFileMove.enabled": "always",
-  "[typescript]": { "editor.defaultFormatter": "esbenp.prettier-vscode" },
-  "[typescriptreact]": { "editor.defaultFormatter": "esbenp.prettier-vscode" },
-  "typescript.format.insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces": true
+  }
 }

CHANGELOG.md

@@ -2,4 +2,585 @@
 
 All notable changes to this project will be documented in this file.
 
-The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+[0.15.0] - 2022-04-13
+
+### Added
+
+- Added setting to save and resume the current queue between sessions (#130) (Thanks @kgarner7)
+- Added a simple "play random" button to the player bar (#276)
+- Added new seek/volume sliders (#272)
+  - Seeking/dragging is now more responsive
+- Added improved discord rich presence (#286)
+- Added download button on the playlist view (#266)
+- (Jellyfin) Added "genre" column to the artist list
+
+### Changed
+
+- Swapped the order of "Seek Forward/Backward" and "Next/Prev Track" buttons on the player bar
+- Global volume is now calculated logarithmically (#275) (Thanks @gelaechter)
+- "Auto playlist" is now named "Play Random" (#276)
+- "Now playing" option is now available on the "Start page" setting
+
+### Fixed
+
+- Playing songs by double clicking on a list should now play in the proper order (#279)
+- (Linux) Fixed MPRIS metadata not updating when player automatically increments (#263)
+- Application fonts now loaded locally instead of from Google CDN (#284)
+- Enabling "Default to Album List on Artist Page" no longer performs a double redirect when entering the artist page (#271)
+- Stop button is no longer disabled when playback is stopped (#273)
+- Various package updates (#288) (Thanks @kgarner7)
+- Top control bar show no longer be accessible when not logged in (#267)
+
+[0.14.0] - 2022-03-12
+
+### Added
+
+- Added zoom options via hotkeys (#252)
+  - Zoom in: CTRL + SHIFT + =
+  - Zoom out: CTRL + SHIFT + -
+- Added PLAY context menu options to the Genre view (#239)
+- Added STOP button to the main player controls (#252)
+- Added "System Notifications" option to display native notifications when the song automatically changes (#245)
+- Added arm64 build (#238)
+- New languages
+  - Spanish (Thanks @ami-sc) (#250)
+  - Sinhala (Thanks @hirusha-adi) (#254)
+
+### Fixed
+
+- (Jellyfin) Fixed the order of returned songs when playing from the Folder view using the context menu (#240)
+- (Linux) Reset MPRIS position to 0 when using "previous track" resets the song 0 (#249)
+- Fixed JavaScript error when removing all songs from the queue using the context menu (#248)
+- Fixed Ampache server support by adding .view to all Subsonic API endpoints (#253)
+
+### Removed
+
+- (Windows) Removed the cover art display when hovering Sonixd on the taskbar (due to new sidebar position) (#242)
+
+[0.13.1] - 2022-02-16
+
+### Fixed
+
+- Fixed startup crash on all OS if the default settings file is not present (#237)
+
+[0.13.0] - 2022-02-16
+
+### Added
+
+- Added new searchbar and search UI (#227, #228)
+- Added playback controls to the Sonixd tray menu (#225)
+- Added playlist selections to the `Start Page` config option
+
+### Changed
+
+- Sidebar changes (#206)
+
+  - Allow resizing of the sidebar when expanded
+  - Allow a toggle of the playerbar's cover art to the sidebar when expanded
+  - Display playlist list on the sidebar under the navigation
+  - Allow configuration of the display of sidebar elements
+
+- Changed the `Artist` row on the playerbar to use a comma delimited list of the song's artists rather than the album artist (#218)
+
+### Fixed
+
+- Fixed the player volume not resetting to its default value when resetting a song while crossfading (#228)
+- (Jellyfin) Fixed artist list not displaying user favorites
+- (Jellyfin) Fixed `bitrate` column not properly by its numeric value (#220)
+- Fixed javascript exception when incrementing/decrementing the queue (#230)
+- Fixed popups/tooltips not using the configured font
+
+[0.12.1] - 2022-02-02
+
+### Fixed
+
+- Fixed translation syntax error causing application to crash when deleting playlists from the context menu (#216)
+- Fixed Player behavior (#217)
+  - No longer scrobbles an additional time after the last song ends when repeat is off
+  - (Jellyfin) Properly handles scrobbling the player's pause/resume and time position
+
+[0.12.0] - 2022-01-31
+
+### Added
+
+- Added support for language/translations (#146) (Thanks @gelaechter)
+  - German translation added (Thanks @gelaechter)
+  - Simplified Chinese translation added (Thanks @fangxx3863)
+- (Windows) Added media keys with desktop overlay (#79) (Thanks @GermanDarknes)
+- (Subsonic) Added support for `/getLyrics` to display the current song's lyrics in a popup (#151)
+- (Jellyfin) Added song list page
+- Added config to choose the default Album/Song list sort on startup (#169)
+- Added config to choose the application start page (#176) (Thanks @GermanDarknes)
+- Added config for pagination for Album/Song list pages
+- (Windows) Added option to set custom directory on installation (#184)
+- Added config to set the default artist page to the album list (#199)
+- Added info mode for the Now Playing page (#160)
+- Added release notes popup
+
+### Changed
+
+- Player behavior
+  - `Media Stop` now stops the track and resets it instead of clearing the queue (#200)
+  - `Media Prev` now resets to the start of the song if pressed after 5 seconds (#207)
+  - `Media Prev` now resets to the start of the song if repeat is off and is the first song of the queue (#207)
+  - `Media Next` now does nothing if repeat is off and is the last song of the queue (#207)
+  - Playing a single track in the queue without repeat no longer plays the track twice (#205)
+  - Scrobbling
+    - (Jellyfin) Scrobbling has been reverted to use the `/sessions/playing` endpoint to support the Playback Reporting plugin (#187)
+    - Scrobbling occurs after 5 seconds has elapsed for the current track as to not instantly mark the song as played
+- Pressing `CTRL + F` or the search button now focuses the text in the searchbar (#203) (Thanks @WeekendWarrior1)
+- Changed loading indicators for all pages
+- OBS scrobble now outputs an image.txt file instead of the downloading the cover image (#136)
+- Player Bar
+  - Album name now appears under the artist
+  - (Subsonic) 5-star rating is available
+  - Clicking on the cover art now displays a full-size image
+  - Clicking on the song name now redirects to the Now Playing queue
+- (Jellyfin) Removed track limit for "Auto Playlist"
+
+### Fixed
+
+- (macOS) Fixed macOS exit behavior (#198) (Thanks @zackslash)
+- (Linux) Fixed MPRIS `position` result (#162)
+- (Subsonic) Fixed artist page crashing the application if server does not support `/getArtistInfo2` (#170)
+- (Jellyfin) Fixed `View all songs` returning songs out of their album track order
+- (Jellyfin) Fixed the "Latest Albums" on the album artist page displaying no albums
+- Fixed card overlay button color on click
+- Fixed buttons on the Album page to work better with light mode
+- Fixed unfavorite button on Album page
+
+[0.11.0] - 2022-01-01
+
+### Added
+
+- Added external integrations
+  - Added Discord rich presence to display the currently playing song (#155)
+  - Added OBS (Open Broadcaster Software) scrobbling to send current track metadata to desktop or the Tuna plugin (#136)
+- Added a `Native` option for Titlebar Style (#148) (Thanks @gelaechter)
+- (Jellyfin) Added toggle to allow transcoding for non-directplay compatible filetypes (#158)
+- Additional MPRIS support
+  - Added metadata:
+    - `albumArtist`, `discNumber`, `trackNumber`, `useCount`, `genre`
+  - Added events:
+    - `seek`, `position`, `volume`, `repeat`, `shuffle`
+
+### Changed
+
+- Overhauled the Artist page
+  - (Jellyfin) Split albums by album artist OR compilation
+  - (Jellyfin) Added artist genres
+  - (Subsonic) Added Top Songs section
+  - Moved related artists to the main page scrolling menu
+  - Added `View All Songs` button to view all songs by the artist
+  - Added artist radio (mix) button
+- Horizontal scrolling menu no longer displays scrollbar
+- Changed button styling on Playlist/Album/Artist pages
+- Changed page image styling to use the card on Playlist/Album/Artist pages
+
+### Fixed
+
+- Fixed various MPRIS features
+  - Synchronized the play/pause state between the player and MPRIS client when pausing from Sonixd (#152)
+  - Fixed the identity of Sonixd to use the app name instead of description (#163)
+- Fixed various submenus opening in the right-click context menu when the option is disabled (#164)
+- Fixed compatibility with older Subsonic API servers (now targets Subsonic v1.13.0) (#144)
+- Fixed playback causing heavily increased CPU/Power usage #145)
+
+[0.10.0] - 2021-12-15
+
+### Added
+
+- Added 2 new default themes
+  - City Lights
+  - One Dark
+- Added additional album filters (#66)
+  - Genres (AND/OR)
+  - Artists (AND/OR)
+  - Years (FROM/TO)
+- Added external column sort filters for multiple pages (#66)
+- Added item counter to page titles
+- `Play Count` column has been added to albums (only works for Navidrome)
+
+### Changed
+
+- Config page has been fully refreshed to a new look
+  - Config popover on the action bar now includes all config tabs
+- Tooltips
+  - Increased default tooltip delay from 250ms -> 500ms
+  - Increased tooltip delay on card overlay buttons to 1000ms
+- Grid view
+  - Placeholder images for playlists, albums, and artists have been updated (inspired from Jellyfin Web UI)
+  - Card title/subtitle width decreased from 100% to default length
+  - Separate card info section from image/overlay buttons on hover
+- Popovers (config, auto playlist, etc)
+  - Now have decreased opacity
+- Enabling/disabling global media keys no longer requires app restart
+
+### Fixed
+
+- (Jellyfin) Fixed `Recently Played` and `Most Played` filters on the Dashboard page (#114)
+- (Jellyfin) Fixed server scrobble (#126)
+  - No longer sends the `/playing` request on song start (prevents song being marked as played when it starts)
+  - Fixed song play count increasing multiple times per play
+- (Jellyfin) Fixed tracks without embedded art displaying placeholder (#128)
+- (Jellyfin) Fixed song `Path` property not displaying data
+- (Subsonic) Fixed login check for Funkwhale servers (#135)
+- Fixed persistent grid-view scroll position
+- Fixed list-view columns
+  - `Visibility` column now properly displays data
+- Selected media folder is now cleared from settings on disconnect (prevents errors when signing into a new server)
+- Fixed adding/removing artist as favorite on the Artist page not updating
+- Fixed search bar not properly handling Asian keyboard inputs
+
+## [0.9.1] - 2021-12-07
+
+### Changed
+
+- List-view scroll position is now persistent for the following:
+  - Now Playing
+  - Playlist list
+  - Favorites (all)
+  - Album list
+  - Artist list
+  - Genre list
+- Grid-view scroll position is now persistent for the following:
+  - Playlist list
+  - Favorites (album/artist)
+  - Album list
+  - Artist list
+- (Jellyfin) Changed audio stream URL to force transcoding off (#108)
+
+### Fixed
+
+- (Jellyfin) Fixed the player not sending the "finish" condition when the song meets the scrobble condition (unresolved from 0.9.0) (#111)
+
+## [0.9.0] - 2021-12-06
+
+### Added
+
+- Added 2 new default themes
+  - Plex-like
+  - Spotify-like
+- Added volume control improvements
+  - Volume value tooltip while hovering the slider
+  - Mouse scroll wheel controls volume while hovering the slider
+  - Clicking the volume icon will mute/unmute
+
+### Changed
+
+- Overhauled all default themes
+  - Rounded buttons, inputs, etc.
+  - Changed grid card hover effects
+    - Removed hover scale
+    - Removed default background on overlay buttons
+    - Moved border to only the image instead of full card
+- Album page
+  - Genre(s) are now listed on a line separate from the artists
+  - Album artist is now distinct from track artists
+  - Increased length of the genre/artist line from 70% -> 80%
+  - The genre/artist line is now scrollable using the mouse wheel
+- (Jellyfin) List view
+  - `Artist` column now uses the album artist property
+  - `Title (Combined)` column now displays all track artists, comma-delimited instead of the album artist
+  - `Genre` column now displays all genres, comma-delimited, left-aligned
+
+### Fixed
+
+- (Jellyfin) Fixed the player not sending the "finish" condition when the song meets the scrobble condition
+- (Jellyfin) Fixed album lists not sorting by the `genre` column
+- (Jellyfin)(API) Fixed the A-Z(Artist) not sorting by Album Artist on the album list
+- (Jellyfin)(API) Fixed auto playlist not respecting the selected music folder
+- (Jellyfin)(API) Fixed the artist page not respecting the selected music folder
+
+## [0.8.5] - 2021-11-25
+
+### Fixed
+
+- Fixed default (OOBE) title column not display data (#104)
+
+## [0.8.4] - 2021-11-25
+
+### Fixed
+
+- (Jellyfin)(Linux) Fixed JS MPRIS error when switching tracks due to unrounded song duration
+- (Linux) Fixed MPRIS artist, genre, and coverart not updating on track change
+
+## [0.8.3] - 2021-11-25
+
+### Fixed
+
+- (Subsonic) Fixed playing a folder from the folder view
+- Fixed rating context menu option available from the Genre page
+
+## [0.8.2] - 2021-11-25
+
+### Added
+
+- Added option to disable auto updates
+
+### Fixed
+
+- Fixed gapless playback on certain \*sonic servers (#100)
+- Fixed playerbar coverart not redirecting to `Now Playing` page
+
+## [0.8.1] - 2021-11-24
+
+### Fixed
+
+- (Subsonic) Fixed errors blocking playlists from being deleted
+
+## [0.8.0] - 2021-11-24
+
+### Added
+
+- Added Jellyfin server support (#87)
+  - Supports full Sonixd feature-set (except ratings)
+- Added a mini config popover to change list/grid view options on the top action bar
+- Added system audio device selector (#96)
+- Added context menu option `Set rating` to bulk set ratings for songs (and albums/artists on Navidrome) (#95)
+
+### Changed
+
+- Reduced cached image from 500px -> 350px (to match max grid size)
+- Grid/header images now respect image aspect ratio returned by the server
+- Playback filter input now uses a regex validation before allowing you to add
+- Renamed all `Name` columns to `Title`
+- Search bar now clears after pressing enter to globally search
+- Added borders to popovers
+
+### Fixed
+
+- Fixed application performance issues when player is crossfading to the next track
+- Fixed null entries showing at the beginning of descending sort on playlist/now playing lists
+- Tooltips no longer pop up on the artist/playlist description when null
+
+## [0.7.0] - 2021-11-15
+
+### Added
+
+- Added download buttons on the Album and Artist pages (#29)
+  - Allows you to download (via browser) or copy download links to your clipboard (to use with a download manager)
+
+### Changed
+
+- Changed default tooltip delay from `500ms` -> `250ms`
+- Moved search bar from page header to the main layout action bar
+- Added notice for macOS media keys to require trusted accessibility in the client
+
+### Fixed
+
+- Fixed auto playlist and album fetch in Gonic servers
+- Fixed the macOS titlebar styling to better match the original (#83)
+- Fixed thumbnailclip error when resizing the application in macOS (#84)
+- Fixed playlist page not using cached image
+
+## [0.6.0] - 2021-11-09
+
+### Added
+
+- Added additional grid-view customization options (#74)
+  - Gap size (spaces between cards)
+  - Alignment (left-align, center-align)
+
+### Changed
+
+- Changed default album/artist uncached image sizes from `150px` -> `350px`
+
+### Fixed
+
+- (Windows) Fixed default taskbar thumbnail on Windows10 when minimized to use window instead of album cover (#73)
+- Fixed playback settings unable to change via the UI
+  - Crossfade duration
+  - Polling interval
+  - Volume fade
+- Fixed header styling on the Config page breaking at smaller window widths (#72)
+- Fixed the position of the description tooltip on the Artist page
+- Fixed the `Add to playlist` popover showing underneath the modal in modal-view
+
+### Removed
+
+- Removed unused `fonts.size.pageTitle` theme property
+
+## [0.5.0] - 2021-11-05
+
+### Added
+
+- Added extensible theming (#60)
+- Added playback presets (gapless, fade, normal) to the config
+- Added persistence for column sort for all list-views (except playlist and search) (#47)
+- Added playback filters to the config to filter out songs based on regex (#53)
+- Added music folder selector in auto playlist (this may or may not work depending on your server)
+- Added improved playlist, artist, and album pages
+  - Added dynamic images on the Playlist page for servers that don't support playlist images (e.g. Navidrome)
+- Added link to open the local `settings.json` file
+- Added setting to use legacy authentication (#63)
+
+### Changed
+
+- Improved overall application keyboard accessibility
+- Playback no longer automatically starts if adding songs to the queue using `Add to queue`
+- Prevent accidental page navigation when using [Ctrl/Shift + Click] when multi-selecting rows in list-view
+- Standardized buttons between the Now Playing page and the mini player
+- "Add random" renamed to "Auto playlist"
+- Increased 'info' notification timeout from 1500ms -> 2000ms
+- Changed default mini player columns to better fit
+- Updated default themes to more modern standards (Default Dark, Default Light)
+
+### Fixed
+
+- Fixed title sort on the `Title (Combined)` column on the album list
+- Fixed 2nd song in queue being skipped when using the "Play" button multiple pages (album, artist, auto playlist)
+- Fixed `Title` column not showing the title on the Folder page (#69)
+- Fixed context menu windows showing underneath the mini player
+- Fixed `Add to queue (next)` adding songs to the wrong unshuffled index when shuffle is enabled
+- Fixed local search on the root Folder page
+- Fixed input picker dropdowns following the page on scroll
+- Fixed the current playing song not highlighted when using `Add to queue` on an empty play queue
+- Fixed artist list not using the `artistImageUrl` returned by Navidrome
+
+## [0.4.1] - 2021-10-27
+
+### Added
+
+- Added links to the genre column on the list-view
+- Added page forward/back buttons to main layout
+
+### Changed
+
+- Increase delay when completing mouse drag select in list view from `100ms` -> `200ms`
+- Change casing for main application name `sonixd` -> `Sonixd`
+
+### Fixed
+
+- Fixed Linux media hotkey support (MPRIS)
+  - Added commands for additional events `play` and `pause` (used by KDE's media player overlay)
+  - Set status to `Playing` when initially starting a song
+  - Set current song metadata when track automatically changes instead of only when it manually changes
+- Fixed filtered link to Album List on the Album page
+- Fixed filtered link to Album List on the Dashboard page
+- Fixed font color for lists/tables in panels
+  - Affects the search view song list and column selector list
+
+## [0.4.0] - 2021-10-26
+
+### Added
+
+- Added music folder selector (#52)
+- Added media hotkeys / MPRIS support for Linux (#50)
+  - This is due to dbus overriding the global shortcuts that electron sends
+- Added advanced column selector component
+  - Drag-n-drop list
+  - Individual resizable columns
+- (Windows) Added tray (Thanks @ncarmic4) (#45)
+  - Settings to minimize/exit to tray
+
+### Changed
+
+- Page selections are now persistent
+  - Active tab on config page
+  - Active tab on favorites page
+  - Filter selector on album list page
+- Playlists can now be saved after being sorted using column filters
+- Folder view
+  - Now shows all root folders in the list instead of in the input picker
+  - Now shows music folders in the input picker
+  - Now uses loader when switching pages
+- Changed styling for various views/components
+  - Look & Feel setting page now split up into multiple panels
+  - Renamed context menu button `Remove from current` -> `Remove selected`
+  - Page header titles width increased from `45%` -> `80%`
+  - Renamed `Scan library` -> `Scan`
+- All pages no longer refetch data when clicking back into the application
+
+### Fixed
+
+- Fixed shift-click multi select on a column-sorted list-view
+- Fixed right-click context menu showing up behind all modals (#55)
+- Fixed mini player showing up behind tag picker elements
+- Fixed duration showing up as `NaN:NaN` when duration is null or invalid
+- Fixed albums showing as a folder in Navidrome instances
+
+## [0.3.0] - 2021-10-16
+
+### Added
+
+- Added folder browser (#1)
+  - Added context menu button `View in folder`
+  - Requires that your server has support for the original `/getIndexes` and `/getMusicDirectory` endpoints
+- Added configurable row-hover highlight for list-view
+- (Windows) Added playback controls in thumbnail toolbar (#32)
+- (Windows/macOS) Added window size/position remembering on application close (#31)
+
+### Changed
+
+- Changed styling for various views/components
+  - Tooltips added on grid-view card hover buttons
+  - Mini-player removed rounded borders and increased opacity
+  - Mini-player removed animation on open/close
+  - Search bar now activated from button -> input on click / CTRL+F
+  - Page header toolbar buttons styling consistency
+  - Album list filter moved from right -> left
+  - Reordered context menu button `Move selected to [...]`
+  - Decreased horizontal width of expanded sidebar from 193px -> 165px
+
+### Fixed
+
+- Fixed duplicate scrobble requests when pause/resuming a song after the scrobble threshold (#30)
+- Fixed genre column not applying in the song list-view
+- Fixed default titlebar set on first run
+
+## [0.2.1] - 2021-10-11
+
+### Fixed
+
+- Fixed using play buttons on the artist view not starting playback
+- Fixed favoriting on horizontal scroll menu on dashboard/search views
+- Fixed typo on default artist list viewtype
+- Fixed artist image selection on artist view
+
+## [0.2.0] - 2021-10-11
+
+### Added
+
+- Added setting to enable scrobbling playing/played tracks to your server (#17)
+- Added setting to change between macOS and Windows styled titlebar (#23)
+- Added app/build versions and update checker on the config page (#18)
+- Added 'view in modal' button on the list-view context menu (#8)
+- Added a persistent indicator on grid-view cards for favorited albums/artists (#7)
+- Added buttons for 'Add to queue (next)' and 'Add to queue (later)' (#6)
+- Added left/right scroll buttons to the horizontal scrolling menu (dashboard/search)
+- Added last.fm link to artist page
+- Added link to cache location to open in local file explorer
+- Added reset to default for cache location
+- Added additional tooltips
+  - Grid-view card title and subtitle buttons
+  - Cover art on the player bar
+  - Header titles on album/artist pages
+
+### Changed
+
+- Changed starring logic on grid-view card to update local cache instead of refetch
+- Changed styling for various views/components
+  - Use dynamically sized hover buttons on grid-view cards depending on the card size
+  - Decreased size of buttons on album/playlist/artist pages
+  - Input picker text color changed from primary theme color to primary text color
+  - Crossfade type config changed from radio buttons to input picker
+  - Disconnect button color from red to default
+  - Tooltip styling updated to better match default theme
+  - Changed tag links to text links on album page
+- Changed page header images to use cache (album/artist)
+  - Artist image now falls back to last.fm if no local image
+
+### Fixed
+
+- Fixed song & image caching (#16)
+- Fixed set default artist list view type on first startup
+
+## [0.1.0] - 2021-10-06
+
+### Added
+
+- Initial release

Dockerfile

@@ -0,0 +1,42 @@
+# Stage 1 - Build frontend
+FROM node:16.5-alpine as ui-builder
+WORKDIR /app
+COPY . .
+RUN npm install && npm run build:renderer
+
+# Stage 2 - Build server
+FROM node:16.5-alpine as server-builder
+WORKDIR /app
+COPY src/server .
+RUN ls -lh
+RUN npm install
+RUN npm run build
+
+# Stage 3 - Deploy
+FROM node:16.5-alpine
+WORKDIR /root
+RUN mkdir appdata
+RUN mkdir sonixd-server
+RUN mkdir sonixd-client
+
+# Install server modules
+COPY src/server/package.json ./sonixd-server
+RUN cd ./sonixd-server && npm install --production
+
+# Add server build files
+COPY --from=server-builder /app/dist ./sonixd-server
+COPY --from=server-builder /app/prisma ./sonixd-server/prisma
+
+# Add client build files
+COPY --from=ui-builder /app/release/app/dist/renderer ./sonixd-client
+
+COPY docker-entrypoint.sh ./sonixd-server/docker-entrypoint.sh
+RUN chmod +x ./sonixd-server/docker-entrypoint.sh
+
+RUN cd ./sonixd-server && npx prisma generate
+RUN npm install pm2 -g
+
+WORKDIR /root/sonixd-server
+
+EXPOSE 9321
+CMD ["sh", "docker-entrypoint.sh"]

README.md

@@ -1,60 +1,129 @@
-# Feishin
+<img src="assets/icon.png" alt="sonixd logo" title="sonixd" align="right" height="60px" />
 
-  <p align="center">
-    <a href="https://github.com/jeffvli/feishin/blob/main/LICENSE">
-      <img src="https://img.shields.io/github/license/jeffvli/feishin?style=flat-square&color=brightgreen"
-      alt="License">
-    </a>
-      <a href="https://github.com/jeffvli/feishin/releases">
-      <img src="https://img.shields.io/github/v/release/jeffvli/feishin?style=flat-square&color=blue"
-      alt="Release">
-    </a>
-    <a href="https://github.com/jeffvli/feishin/releases">
-      <img src="https://img.shields.io/github/downloads/jeffvli/feishin/total?style=flat-square&color=orange"
-      alt="Downloads">
-    </a>
-  </p>
-  <p align="center">
-    <a href="https://discord.gg/FVKpcMDy5f">
-      <img src="https://img.shields.io/discord/922656312888811530?color=black&label=discord&logo=discord&logoColor=white"
-      alt="Discord">
-    </a>
-    <a href="https://matrix.to/#/#sonixd:matrix.org">
-      <img src="https://img.shields.io/matrix/sonixd:matrix.org?color=black&label=matrix&logo=matrix&logoColor=white"
-      alt="Matrix">
-    </a>
-  </p>
+# Sonixd
 
-Repository for the rewrite of [Sonixd](https://github.com/jeffvli/sonixd).
+  <a href="https://github.com/jeffvli/sonixd/releases">
+    <img src="https://img.shields.io/github/v/release/jeffvli/sonixd?style=flat-square&color=blue"
+    alt="Release">
+  </a>
+  <a href="https://github.com/jeffvli/sonixd/blob/main/LICENSE">
+    <img src="https://img.shields.io/github/license/jeffvli/sonixd?style=flat-square&color=brightgreen"
+    alt="License">
+  </a>
+  <a href="https://github.com/jeffvli/sonixd/releases">
+    <img src="https://img.shields.io/github/downloads/jeffvli/sonixd/total?style=flat-square&color=orange"
+    alt="Downloads">
+  </a>
+  <a href="https://discord.gg/FVKpcMDy5f">
+    <img src="https://img.shields.io/discord/922656312888811530?color=red&label=discord&logo=discord&logoColor=white"
+    alt="Discord">
+  </a>
+  <a href="https://matrix.to/#/#sonixd:matrix.org">
+    <img src="https://img.shields.io/matrix/sonixd:matrix.org?color=red&label=matrix&logo=matrix&logoColor=white"
+    alt="Matrix">
+  </a>
 
-## Getting Started
+Sonixd is a cross-platform desktop client built for Subsonic-API (and Jellyfin in 0.8.0+) compatible music servers. This project was inspired by the many existing clients, but aimed to address a few key issues including <strong>scalability</strong>, <strong>library management</strong>, and <strong>user experience</strong>.
 
-Download the [latest desktop client](https://github.com/jeffvli/feishin/releases).
+- [**Usage documentation & FAQ**](https://github.com/jeffvli/sonixd/discussions/15)
+- [**Theming documentation**](https://github.com/jeffvli/sonixd/discussions/61)
 
-### After installing the server and database
+Sonixd has been tested on the following: [Navidrome](https://github.com/navidrome/navidrome), [Airsonic](https://github.com/airsonic/airsonic), [Airsonic-Advanced](https://github.com/airsonic-advanced/airsonic-advanced), [Gonic](https://github.com/sentriz/gonic), [Astiga](https://asti.ga/), [Jellyfin](https://github.com/jellyfin/jellyfin)
 
-You can access the desktop client via the [latest release](https://github.com/jeffvli/feishin/releases), or you can visit the web client at your server URL (e.g http://192.168.0.1:8643).
+### [Demo Sonixd using Navidrome](https://github.com/jeffvli/sonixd/discussions/244)
 
-## FAQ
+## Features
 
-### What music servers does Feishin support?
+- HTML5 audio with crossfading and gapless\* playback
+- Drag and drop rows with multi-select
+- Modify and save playlists intuitively
+- Handles large playlists and queues
+- Global mediakeys (and partial MPRIS) support
+- Multi-theme support
+- Supports all Subsonic/Jellyfin API compatible servers
+- Built with Electron, React with the [rsuite v4](https://github.com/rsuite/rsuite) component library
 
-Feishin supports any music server that implements a [Navidrome](https://www.navidrome.org/) or [Jellyfin](https://jellyfin.org/) API.
+<h5>* Gapless playback is artifically created using the crossfading players so it may not be perfect, YMMV.</h5>
 
-- [Jellyfin](https://github.com/jellyfin/jellyfin)
-- [Navidrome](https://github.com/navidrome/navidrome)
-- ~~[Airsonic](https://github.com/airsonic/airsonic)~~
-- ~~[Airsonic-Advanced](https://github.com/airsonic-advanced/airsonic-advanced)~~
-- ~~[Gonic](https://github.com/sentriz/gonic)~~
-- ~~[Astiga](https://asti.ga/)~~
-- ~~[Supysonic](https://github.com/spl0k/supysonic)~~
+## Screenshots
 
-## Development
+<a href="https://raw.githubusercontent.com/jeffvli/sonixd/main/assets/screenshots/0.13.1/album.png"><img src="https://raw.githubusercontent.com/jeffvli/sonixd/main/assets/screenshots/0.13.1/album.png" width="49.5%"/></a>
+<a href="https://raw.githubusercontent.com/jeffvli/sonixd/main/assets/screenshots/0.13.1/artist.png"><img src="https://raw.githubusercontent.com/jeffvli/sonixd/main/assets/screenshots/0.13.1/artist.png" width="49.5%"/></a>
+<a href="https://raw.githubusercontent.com/jeffvli/sonixd/main/assets/screenshots/0.13.1/search.png"><img src="https://raw.githubusercontent.com/jeffvli/sonixd/main/assets/screenshots/0.13.1/search.png" width="49.5%"/></a>
+<a href="https://raw.githubusercontent.com/jeffvli/sonixd/main/assets/screenshots/0.13.1/now_playing.png"><img src="https://raw.githubusercontent.com/jeffvli/sonixd/main/assets/screenshots/0.13.1/now_playing.png" width="49.5%"/></a>
 
-Built and tested using Node `v16.15.0`.
+## Install
 
-This project is built off of [electron-react-boilerplate](https://github.com/electron-react-boilerplate/electron-react-boilerplate) v4.6.0.
+You can install sonixd by downloading the [latest release](https://github.com/jeffvli/sonixd/releases) for your specified operating system.
+
+---
+
+### Windows
+
+If you prefer not to download the release binary, you can install using `winget`.
+
+Using your favorite terminal (cmd/pwsh):
+
+```
+winget install sonixd
+```
+
+---
+
+### Arch Linux
+
+There is an AUR package of the latest AppImage release available [here](https://aur.archlinux.org/packages/sonixd-appimage).
+
+To install it you can use your favourite AUR package manager and install the package: `sonixd-appimage`
+
+For example using `yay`:
+
+```
+yay -S sonixd-appimage
+```
+
+If you encounter any problems please comment on the [AUR](https://aur.archlinux.org/packages/sonixd-appimage) or contact the [maintainer](mailto:robin@blckct.io) directly before you open an issue here.
+
+---
+
+Once installed, run the application and sign in to your music server with the following details. If you are using [airsonic-advanced](https://github.com/airsonic-advanced/airsonic-advanced), you will need to make sure that you create a `decodable` credential for your login user within the admin control panel.
+
+- Server - `e.g. http://localhost:4040/`
+- User name - `e.g. admin`
+- Password - `e.g. supersecret!`
+
+If you have any questions, feel free to check out the [Usage Documentation & FAQ](https://github.com/jeffvli/sonixd/discussions/15).
+
+## Development / Contributing
+
+This project is built off of [electron-react-boilerplate](https://github.com/electron-react-boilerplate/electron-react-boilerplate) v2.3.0.
+If you want to contribute to this project, please first create an [issue](https://github.com/jeffvli/sonixd/issues/new) or [discussion](https://github.com/jeffvli/sonixd/discussions/new) so that we can both discuss the idea and its feasability for integration.
+
+First, clone the repo via git and install dependencies (Windows development now requires additional setup, see [#232](https://github.com/jeffvli/sonixd/issues/232)):
+
+```bash
+git clone https://github.com/jeffvli/sonixd.git
+yarn install
+```
+
+Start the app in the `dev` environment:
+
+```bash
+yarn start
+```
+
+To package apps for the local platform:
+
+```bash
+yarn package
+```
+
+If you receive errors while packaging the application, try upgrading/downgrading your Node version (tested on v14.18.0).
+
+If you are unable to run via debug in VS Code, check troubleshooting steps [here](https://github.com/electron-react-boilerplate/electron-react-boilerplate/issues/2757#issuecomment-784200527).
+
+If your devtools extensions are failing to run/install, check troubleshooting steps [here](https://github.com/electron-react-boilerplate/electron-react-boilerplate/issues/2788).
 
 ## License
 
-[GNU General Public License v3.0 ©](https://github.com/jeffvli/feishin/blob/dev/LICENSE)
+[GNU General Public License v3.0 ©](https://github.com/jeffvli/sonixd/blob/main/LICENSE)

docker-compose.dev.yml

@@ -0,0 +1,47 @@
+version: '3'
+services:
+  db:
+    container_name: sonixd_db
+    image: postgres:13
+    volumes:
+      - ${DATABASE_PERSIST_PATH}:/var/lib/postgresql/data
+    environment:
+      - POSTGRES_USER=${DATABASE_USERNAME}
+      - POSTGRES_PASSWORD=${DATABASE_PASSWORD}
+      - POSTGRES_DB=${DATABASE_NAME}
+    ports:
+      - '${DATABASE_PORT}:5432'
+    restart: unless-stopped
+  server:
+    container_name: sonixd_server
+    volumes:
+      - ./src/server:/app # Synchronise docker container with local change
+      - /app/node_modules # Avoid re-copying local node_modules. Cache in container.
+    build:
+      context: ./src/server
+      dockerfile: Dockerfile
+    depends_on:
+      - db
+    environment:
+      - APP_BASE_URL=${APP_BASE_URL}
+      - DATABASE_URL=postgresql://${DATABASE_USERNAME}:${DATABASE_PASSWORD}@db/${DATABASE_NAME}?schema=public&connection_limit=14&pool_timeout=20
+      - DATABASE_PORT=${DATABASE_PORT}
+      - TOKEN_SECRET=${TOKEN_SECRET}
+    ports:
+      - '9321:9321'
+    restart: unless-stopped
+  prisma:
+    container_name: sonixd_prisma_studio
+    volumes:
+      - ./src/server/prisma:/app/prisma
+    build:
+      context: ./src/server/prisma
+      dockerfile: Dockerfile
+    depends_on:
+      - db
+      - server
+    environment:
+      - DATABASE_URL=postgresql://${DATABASE_USERNAME}:${DATABASE_PASSWORD}@db/${DATABASE_NAME}?schema=public
+    ports:
+      - '5555:5555'
+    restart: unless-stopped

docker-compose.yml

@@ -0,0 +1,25 @@
+version: '3'
+services:
+  db:
+    container_name: sonixd_db
+    image: postgres:13
+    ports:
+      - '5432:5432'
+    volumes:
+      - ${DB_PERSIST_PATH}:/var/lib/postgresql/data
+    environment:
+      - POSTGRES_USER=${DB_USERNAME}
+      - POSTGRES_PASSWORD=${DB_PASSWORD}
+      - POSTGRES_DB=${DB_NAME}
+  server:
+    container_name: sonixd
+    image: sonixd:latest
+    depends_on:
+      - db
+    environment:
+      - APP_BASE_URL=${APP_BASE_URL}
+      - DATABASE_URL=postgresql://${DB_USERNAME}:${DB_PASSWORD}@db/${DB_NAME}?schema=public&connection_limit=14&pool_timeout=20
+      - DATABASE_SECRET=${DB_SECRET}
+    ports:
+      - '9321:9321'
+    restart: always

docker-entrypoint.sh

@@ -0,0 +1,3 @@
+npx prisma migrate deploy
+npx ts-node prisma/seed.ts
+pm2-runtime server.js

package.json

@@ -1,8 +1,7 @@
 {
-  "name": "feishin",
-  "productName": "Feishin",
-  "description": "Feishin music server",
-  "version": "0.0.1-alpha2",
+  "name": "sonixd",
+  "productName": "Sonixd",
+  "description": "A full-featured Subsonic/Jellyfin compatible music player",
   "scripts": {
     "build": "concurrently \"npm run build:main\" \"npm run build:renderer\"",
     "build:main": "cross-env NODE_ENV=production TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.main.prod.ts",
@@ -11,7 +10,6 @@
     "lint": "cross-env NODE_ENV=development eslint . --ext .js,.jsx,.ts,.tsx",
     "lint:styles": "npx stylelint **/*.tsx",
     "package": "ts-node ./.erb/scripts/clean.js dist && npm run build && electron-builder build --publish never",
-    "package:dev": "ts-node ./.erb/scripts/clean.js dist && npm run build && electron-builder build --publish never --dir",
     "postinstall": "ts-node .erb/scripts/check-native-dep.js && electron-builder install-app-deps && cross-env NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.renderer.dev.dll.ts",
     "start": "ts-node ./.erb/scripts/check-port-in-use.js && npm run start:renderer",
     "start:main": "cross-env NODE_ENV=development electron -r ts-node/register/transpile-only ./src/main/main.ts",
@@ -21,8 +19,10 @@
     "test": "jest",
     "prepare": "husky install",
     "i18next": "i18next -c src/renderer/i18n/i18next-parser.config.js",
-    "prod:buildserver": "pwsh -c \"./scripts/server-build.ps1\"",
-    "prod:publishserver": "pwsh -c \"./scripts/server-publish.ps1\""
+    "docker:up": "docker compose --file docker-compose.dev.yml --env-file .env.dev up --detach && docker compose --file docker-compose.dev.yml --env-file .env.dev logs -f",
+    "docker:down": "docker compose --file docker-compose.dev.yml --env-file .env.dev down && docker image rm sonixd_prisma",
+    "docker:migrate": "cd src/server && npx prisma generate && docker exec -ti sonixd_server sh -c \"npx prisma generate && npx prisma db push\"",
+    "docker:reset": "docker exec -ti sonixd_server sh -c \"npx prisma migrate reset && npx prisma db push && npx ts-node prisma/seed.ts\""
   },
   "lint-staged": {
     "*.{js,jsx,ts,tsx}": [
@@ -39,8 +39,8 @@
     ]
   },
   "build": {
-    "productName": "Feishin",
-    "appId": "org.jeffvli.feishin",
+    "productName": "Sonixd",
+    "appId": "org.erb.sonixd",
     "artifactName": "${productName}-${version}-${os}-${arch}.${ext}",
     "asar": true,
     "asarUnpack": "**\\*.{node,dll}",
@@ -103,12 +103,12 @@
     "publish": {
       "provider": "github",
       "owner": "jeffvli",
-      "repo": "feishin"
+      "repo": "sonixd"
     }
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/jeffvli/feishin.git"
+    "url": "git+https://github.com/jeffvli/sonixd.git"
   },
   "author": {
     "name": "jeffvli",
@@ -117,7 +117,7 @@
   "contributors": [],
   "license": "GPL-3.0",
   "bugs": {
-    "url": "https://github.com/jeffvli/feishin/issues"
+    "url": "https://github.com/jeffvli/sonixd/issues"
   },
   "keywords": [
     "subsonic",
@@ -127,7 +127,7 @@
     "react",
     "electron"
   ],
-  "homepage": "https://github.com/jeffvli/feishin",
+  "homepage": "https://github.com/jeffvli/sonixd",
   "jest": {
     "testURL": "http://localhost/",
     "testEnvironment": "jsdom",
@@ -162,24 +162,24 @@
     "@teamsupercell/typings-for-css-modules-loader": "^2.5.1",
     "@testing-library/jest-dom": "^5.16.4",
     "@testing-library/react": "^13.0.0",
-    "@types/electron-localshortcut": "^3.1.0",
     "@types/jest": "^27.4.1",
-    "@types/lodash": "^4.14.188",
+    "@types/lodash": "^4.14.182",
     "@types/md5": "^2.3.2",
     "@types/node": "^17.0.23",
-    "@types/react": "^18.0.25",
-    "@types/react-dom": "^18.0.8",
+    "@types/react": "^17.0.43",
+    "@types/react-dom": "^17.0.14",
+    "@types/react-lazy-load-image-component": "^1.5.2",
     "@types/react-slider": "^1.3.1",
     "@types/react-test-renderer": "^17.0.1",
     "@types/react-virtualized-auto-sizer": "^1.0.1",
     "@types/react-window": "^1.8.5",
     "@types/react-window-infinite-loader": "^1.0.6",
-    "@types/styled-components": "^5.1.26",
+    "@types/styled-components": "^5.1.25",
     "@types/terser-webpack-plugin": "^5.0.4",
     "@types/webpack-bundle-analyzer": "^4.4.1",
     "@types/webpack-env": "^1.16.3",
-    "@typescript-eslint/eslint-plugin": "^5.47.0",
-    "@typescript-eslint/parser": "^5.47.0",
+    "@typescript-eslint/eslint-plugin": "^5.18.0",
+    "@typescript-eslint/parser": "^5.18.0",
     "browserslist-config-erb": "^0.0.3",
     "chalk": "^4.1.2",
     "concurrently": "^7.1.0",
@@ -188,13 +188,13 @@
     "css-loader": "^6.7.1",
     "css-minimizer-webpack-plugin": "^3.4.1",
     "detect-port": "^1.3.0",
-    "electron": "^21.2.0",
+    "electron": "^18.0.1",
     "electron-builder": "^23.0.3",
     "electron-devtools-installer": "^3.2.0",
     "electron-notarize": "^1.2.1",
     "electron-rebuild": "^3.2.7",
     "electronmon": "^2.0.2",
-    "eslint": "^8.30.0",
+    "eslint": "^8.12.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-config-erb": "^4.0.3",
     "eslint-import-resolver-typescript": "^2.7.1",
@@ -236,8 +236,7 @@
     "ts-jest": "^27.1.4",
     "ts-loader": "^9.2.8",
     "ts-node": "^10.7.0",
-    "tsconfig-paths-webpack-plugin": "^4.0.0",
-    "typescript": "^4.8.4",
+    "typescript": "^4.6.4",
     "typescript-plugin-styled-components": "^2.0.0",
     "url-loader": "^4.1.1",
     "webpack": "^5.71.0",
@@ -247,58 +246,43 @@
     "webpack-merge": "^5.8.0"
   },
   "dependencies": {
-    "@ag-grid-community/client-side-row-model": "^28.2.1",
-    "@ag-grid-community/core": "^28.2.1",
-    "@ag-grid-community/infinite-row-model": "^28.2.1",
-    "@ag-grid-community/react": "^28.2.1",
-    "@ag-grid-community/styles": "^28.2.1",
-    "@emotion/react": "^11.10.4",
-    "@mantine/core": "^5.9.5",
-    "@mantine/dates": "^5.9.5",
-    "@mantine/dropzone": "^5.9.5",
-    "@mantine/form": "^5.9.5",
-    "@mantine/hooks": "^5.9.5",
-    "@mantine/modals": "^5.9.5",
-    "@mantine/notifications": "^5.9.5",
-    "@mantine/spotlight": "^5.9.5",
-    "@tanstack/react-query": "^4.16.1",
-    "@tanstack/react-query-devtools": "^4.16.1",
-    "dayjs": "^1.11.6",
+    "@jellyfin/client-axios": "^10.7.8",
+    "@mantine/core": "^5.0.0",
+    "@mantine/form": "^5.0.0",
+    "@mantine/hooks": "^5.0.0",
+    "axios": "^0.26.1",
     "electron-debug": "^3.2.0",
-    "electron-localshortcut": "^3.2.1",
     "electron-log": "^4.4.6",
-    "electron-store": "^8.1.0",
     "electron-updater": "^4.6.5",
-    "fast-average-color": "^9.2.0",
     "format-duration": "^2.0.0",
-    "framer-motion": "^7.10.2",
+    "framer-motion": "^6.4.2",
     "history": "^5.3.0",
     "i18next": "^21.6.16",
     "immer": "^9.0.15",
     "is-electron": "^2.2.1",
-    "ky": "^0.33.0",
     "lodash": "^4.17.21",
     "md5": "^2.3.0",
-    "memoize-one": "^6.0.0",
     "nanoid": "^3.3.3",
     "net": "^1.0.2",
     "node-mpv": "^2.0.0-beta.2",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
-    "react-error-boundary": "^3.1.4",
+    "react": "^18.0.0",
+    "react-dom": "^18.0.0",
+    "react-helmet-async": "^1.3.0",
     "react-i18next": "^11.16.7",
-    "react-icons": "^4.7.1",
-    "react-player": "^2.11.0",
-    "react-router": "^6.5.0",
-    "react-router-dom": "^6.5.0",
-    "react-simple-img": "^3.0.0",
-    "react-slider": "^2.0.4",
+    "react-lazy-load-image-component": "^1.5.4",
+    "react-player": "^2.10.0",
+    "react-query": "^4.0.0-beta.23",
+    "react-router": "^6.3.0",
+    "react-router-dom": "^6.3.0",
+    "react-slider": "^2.0.0",
+    "react-spaces": "^0.3.4",
+    "react-use": "^17.3.2",
     "react-virtualized-auto-sizer": "^1.0.6",
-    "react-window": "^1.8.8",
+    "react-window": "^1.8.7",
     "react-window-infinite-loader": "^1.0.8",
-    "styled-components": "^5.3.6",
-    "zod": "^3.19.1",
-    "zustand": "^4.1.4"
+    "styled-components": "^5.3.5",
+    "tabler-icons-react": "^1.46.0",
+    "zustand": "^4.0.0-rc.1"
   },
   "resolutions": {
     "styled-components": "^5"
@@ -308,10 +292,18 @@
     "npm": ">=7.x"
   },
   "browserslist": [],
-  "electronmon": {
-    "patterns": [
-      "!server",
-      "!src/renderer"
-    ]
+  "prettier": {
+    "overrides": [
+      {
+        "files": [
+          ".prettierrc",
+          ".eslintrc"
+        ],
+        "options": {
+          "parser": "json"
+        }
+      }
+    ],
+    "singleQuote": true
   }
 }

release/app/package-lock.json

@@ -1,14 +1,14 @@
 {
-  "name": "feishin",
-  "version": "0.0.1-alpha2",
+  "name": "sonixd",
+  "version": "1.0.0-alpha1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
-      "name": "feishin",
-      "version": "0.0.1-alpha2",
+      "name": "sonixd",
+      "version": "1.0.0-alpha1",
       "hasInstallScript": true,
-      "license": "GPL-3.0"
+      "license": "MIT"
     }
   }
 }

release/app/package.json

@@ -1,7 +1,7 @@
 {
-  "name": "feishin",
-  "version": "0.0.1-alpha2",
-  "description": "",
+  "name": "sonixd",
+  "version": "1.0.0-alpha1",
+  "description": "A full-featured Subsonic/Jellyfin compatible desktop client",
   "main": "./dist/main/main.js",
   "author": {
     "name": "jeffvli",
@@ -13,5 +13,5 @@
     "postinstall": "npm run electron-rebuild && npm run link-modules"
   },
   "dependencies": {},
-  "license": "GPL-3.0"
+  "license": "MIT"
 }

src/__tests__/App.test.tsx

@@ -1,9 +1,10 @@
 import '@testing-library/jest-dom';
-import { render } from '@testing-library/react';
-import { App } from '../renderer/app';
+// import { render } from '@testing-library/react';
+// import { App } from 'renderer/app';
 
 describe('App', () => {
-  it('should render', () => {
-    expect(render(<App />)).toBeTruthy();
-  });
+  // eslint-disable-next-line jest/no-commented-out-tests
+  // it('should render', () => {
+  //   expect(render(<App />)).toBeTruthy();
+  // });
 });

src/main/features/core/index.ts

@@ -1,2 +1 @@
 import './player';
-import './settings';

src/main/features/core/player/index.ts

@@ -1,62 +1,32 @@
 import { ipcMain } from 'electron';
-import uniq from 'lodash/uniq';
 import MpvAPI from 'node-mpv';
-import { store } from '../settings';
+import { PlayerData } from '../../../../renderer/store';
 import { getMainWindow } from '../../../main';
-import { PlayerData } from '/@/renderer/store';
-
-declare module 'node-mpv';
-
-const BINARY_PATH = store.get('mpv_path') as string | undefined;
-const MPV_PARAMETERS = store.get('mpv_parameters') as Array<string> | undefined;
-const DEFAULT_MPV_PARAMETERS = () => {
-  const parameters = [];
-  if (
-    !MPV_PARAMETERS?.includes('--gapless-audio=weak') ||
-    !MPV_PARAMETERS?.includes('--gapless-audio=no') ||
-    !MPV_PARAMETERS?.includes('--gapless-audio=yes') ||
-    !MPV_PARAMETERS?.includes('--gapless-audio')
-  ) {
-    parameters.push('--gapless-audio=yes');
-  }
-
-  if (
-    !MPV_PARAMETERS?.includes('--prefetch-playlist=no') ||
-    !MPV_PARAMETERS?.includes('--prefetch-playlist=yes') ||
-    !MPV_PARAMETERS?.includes('--prefetch-playlist')
-  ) {
-    parameters.push('--prefetch-playlist=yes');
-  }
-
-  return parameters;
-};
 
 const mpv = new MpvAPI(
   {
     audio_only: true,
     auto_restart: true,
-    binary: BINARY_PATH || '',
+    binary: 'C:/ProgramData/chocolatey/lib/mpv.install/tools/mpv.exe',
     time_update: 1,
   },
-  MPV_PARAMETERS
-    ? uniq([...DEFAULT_MPV_PARAMETERS(), ...MPV_PARAMETERS])
-    : DEFAULT_MPV_PARAMETERS(),
+  ['--gapless-audio=yes', '--prefetch-playlist']
 );
 
-mpv.start().catch((error) => {
-  console.log('error starting mpv', error);
+mpv.start().catch((error: any) => {
+  console.log('error', error);
 });
 
-mpv.on('status', (status) => {
+mpv.on('status', (status: any) => {
   if (status.property === 'playlist-pos') {
     if (status.value !== 0) {
-      getMainWindow()?.webContents.send('renderer-player-auto-next');
+      getMainWindow()?.webContents.send('renderer-player-set-queue-next');
     }
   }
 });
 
 // Automatically updates the play button when the player is playing
-mpv.on('resumed', () => {
+mpv.on('started', () => {
   getMainWindow()?.webContents.send('renderer-player-play');
 });
 
@@ -79,6 +49,10 @@ mpv.on('timeposition', (time: number) => {
   getMainWindow()?.webContents.send('renderer-player-current-time', time);
 });
 
+mpv.on('seek', () => {
+  console.log('mpv seek');
+});
+
 // Starts the player
 ipcMain.on('player-play', async () => {
   await mpv.play();
@@ -94,14 +68,14 @@ ipcMain.on('player-stop', async () => {
   await mpv.stop();
 });
 
-// Goes to the next track in the playlist
+// Stops the player
 ipcMain.on('player-next', async () => {
   await mpv.next();
 });
 
-// Goes to the previous track in the playlist
+// Stops the player
 ipcMain.on('player-previous', async () => {
-  await mpv.prev();
+  await mpv.previous();
 });
 
 // Seeks forward or backward by the given amount of seconds
@@ -114,7 +88,7 @@ ipcMain.on('player-seek-to', async (_event, time: number) => {
   await mpv.goToPosition(time);
 });
 
-// Sets the queue in position 0 and 1 to the given data. Used when manually starting a song or using the next/prev buttons
+// Sets the queue to the given data. Used when manually starting a song or using the next/prev buttons
 ipcMain.on('player-set-queue', async (_event, data: PlayerData) => {
   if (data.queue.current) {
     await mpv.load(data.queue.current.streamUrl, 'replace');
@@ -125,26 +99,8 @@ ipcMain.on('player-set-queue', async (_event, data: PlayerData) => {
   }
 });
 
-// Replaces the queue in position 1 to the given data
-ipcMain.on('player-set-queue-next', async (_event, data: PlayerData) => {
-  const size = await mpv.getPlaylistSize();
-
-  if (size > 1) {
-    await mpv.playlistRemove(1);
-  }
-
-  if (data.queue.next) {
-    await mpv.load(data.queue.next.streamUrl, 'append');
-  }
-});
-
 // Sets the next song in the queue when reaching the end of the queue
-ipcMain.on('player-auto-next', async (_event, data: PlayerData) => {
-  // Always keep the current song as position 0 in the mpv queue
-  // This allows us to easily set update the next song in the queue without
-  // disturbing the currently playing song
-  await mpv.playlistRemove(0);
-
+ipcMain.on('player-set-queue-next', async (_event, data: PlayerData) => {
   if (data.queue.next) {
     await mpv.load(data.queue.next.streamUrl, 'append');
   }
@@ -152,14 +108,10 @@ ipcMain.on('player-auto-next', async (_event, data: PlayerData) => {
 
 // Sets the volume to the given value (0-100)
 ipcMain.on('player-volume', async (_event, value: number) => {
-  await mpv.volume(value);
+  mpv.volume(value);
 });
 
 // Toggles the mute status
 ipcMain.on('player-mute', async () => {
-  await mpv.mute();
-});
-
-ipcMain.on('player-quit', async () => {
-  await mpv.quit();
+  mpv.mute();
 });

src/main/features/core/player/media-keys.ts

@@ -1,27 +0,0 @@
-/* eslint-disable promise/always-return */
-import { BrowserWindow, globalShortcut } from 'electron';
-
-export const enableMediaKeys = (window: BrowserWindow | null) => {
-  globalShortcut.register('MediaStop', () => {
-    window?.webContents.send('renderer-player-stop');
-  });
-
-  globalShortcut.register('MediaPlayPause', () => {
-    window?.webContents.send('renderer-player-play-pause');
-  });
-
-  globalShortcut.register('MediaNextTrack', () => {
-    window?.webContents.send('renderer-player-next');
-  });
-
-  globalShortcut.register('MediaPreviousTrack', () => {
-    window?.webContents.send('renderer-player-previous');
-  });
-};
-
-export const disableMediaKeys = () => {
-  globalShortcut.unregister('MediaStop');
-  globalShortcut.unregister('MediaPlayPause');
-  globalShortcut.unregister('MediaNextTrack');
-  globalShortcut.unregister('MediaPreviousTrack');
-};

src/main/features/core/player/mpv.ts

@@ -0,0 +1 @@
+declare module 'node-mpv';

src/main/features/core/settings/index.ts

@@ -1,12 +0,0 @@
-import { ipcMain } from 'electron';
-import Store from 'electron-store';
-
-export const store = new Store();
-
-ipcMain.handle('settings-get', (_event, data: { property: string }) => {
-  return store.get(`${data.property}`);
-});
-
-ipcMain.on('settings-set', (__event, data: { property: string; value: any }) => {
-  store.set(`${data.property}`, data.value);
-});

src/main/main.ts

@@ -9,12 +9,9 @@
  * `./src/main.js` using webpack. This gives us some performance wins.
  */
 import path from 'path';
-import { app, BrowserWindow, shell, ipcMain, globalShortcut } from 'electron';
-import electronLocalShortcut from 'electron-localshortcut';
+import { app, BrowserWindow, shell, ipcMain } from 'electron';
 import log from 'electron-log';
 import { autoUpdater } from 'electron-updater';
-import { disableMediaKeys, enableMediaKeys } from './features/core/player/media-keys';
-import { store } from './features/core/settings/index';
 import MenuBuilder from './menu';
 import { resolveHtmlPath } from './utils';
 import './features';
@@ -34,7 +31,8 @@ if (process.env.NODE_ENV === 'production') {
   sourceMapSupport.install();
 }
 
-const isDevelopment = process.env.NODE_ENV === 'development' || process.env.DEBUG_PROD === 'true';
+const isDevelopment =
+  process.env.NODE_ENV === 'development' || process.env.DEBUG_PROD === 'true';
 
 if (isDevelopment) {
   require('electron-debug')();
@@ -48,7 +46,7 @@ const installExtensions = async () => {
   return installer
     .default(
       extensions.map((name) => installer[name]),
-      forceDownload,
+      forceDownload
     )
     .catch(console.log);
 };
@@ -68,13 +66,14 @@ const createWindow = async () => {
 
   mainWindow = new BrowserWindow({
     frame: false,
-    height: 900,
+    height: 728,
     icon: getAssetPath('icon.png'),
     minHeight: 600,
     minWidth: 640,
     show: false,
     webPreferences: {
       backgroundThrottling: false,
+
       contextIsolation: true,
       devTools: true,
       nodeIntegration: true,
@@ -82,11 +81,7 @@ const createWindow = async () => {
         ? path.join(__dirname, 'preload.js')
         : path.join(__dirname, '../../.erb/dll/preload.js'),
     },
-    width: 1440,
-  });
-
-  electronLocalShortcut.register(mainWindow, 'Ctrl+Shift+I', () => {
-    mainWindow?.webContents.openDevTools();
+    width: 1024,
   });
 
   ipcMain.on('window-maximize', () => {
@@ -105,25 +100,6 @@ const createWindow = async () => {
     mainWindow?.close();
   });
 
-  ipcMain.on('app-restart', () => {
-    app.relaunch();
-    app.exit(0);
-  });
-
-  ipcMain.on('global-media-keys-enable', () => {
-    enableMediaKeys(mainWindow);
-  });
-
-  ipcMain.on('global-media-keys-disable', () => {
-    disableMediaKeys();
-  });
-
-  const globalMediaKeysEnabled = store.get('global_media_hotkeys') as boolean;
-
-  if (globalMediaKeysEnabled) {
-    enableMediaKeys(mainWindow);
-  }
-
   mainWindow.loadURL(resolveHtmlPath('index.html'));
 
   mainWindow.on('ready-to-show', () => {
@@ -159,20 +135,18 @@ const createWindow = async () => {
  * Add event listeners...
  */
 
-app.commandLine.appendSwitch('disable-features', 'HardwareMediaKeyHandling,MediaSessionService');
+app.commandLine.appendSwitch(
+  'disable-features',
+  'HardwareMediaKeyHandling,MediaSessionService'
+);
 
 export const getMainWindow = () => {
   return mainWindow;
 };
 
-app.on('before-quit', () => {
-  mainWindow?.webContents.send('renderer-player-quit');
-});
-
 app.on('window-all-closed', () => {
   // Respect the OSX convention of having the application in memory even
   // after all windows have been closed
-  globalShortcut.unregisterAll();
   if (process.platform !== 'darwin') {
     app.quit();
   }

src/main/menu.ts

@@ -1,4 +1,10 @@
-import { app, Menu, shell, BrowserWindow, MenuItemConstructorOptions } from 'electron';
+import {
+  app,
+  Menu,
+  shell,
+  BrowserWindow,
+  MenuItemConstructorOptions,
+} from 'electron';
 
 interface DarwinMenuItemConstructorOptions extends MenuItemConstructorOptions {
   selector?: string;
@@ -13,12 +19,17 @@ export default class MenuBuilder {
   }
 
   buildMenu(): Menu {
-    if (process.env.NODE_ENV === 'development' || process.env.DEBUG_PROD === 'true') {
+    if (
+      process.env.NODE_ENV === 'development' ||
+      process.env.DEBUG_PROD === 'true'
+    ) {
       this.setupDevelopmentEnvironment();
     }
 
     const template =
-      process.platform === 'darwin' ? this.buildDarwinTemplate() : this.buildDefaultTemplate();
+      process.platform === 'darwin'
+        ? this.buildDarwinTemplate()
+        : this.buildDefaultTemplate();
 
     const menu = Menu.buildFromTemplate(template);
     Menu.setApplicationMenu(menu);
@@ -32,10 +43,10 @@ export default class MenuBuilder {
 
       Menu.buildFromTemplate([
         {
+          label: 'Inspect element',
           click: () => {
             this.mainWindow.webContents.inspectElement(x, y);
           },
-          label: 'Inspect element',
         },
       ]).popup({ window: this.mainWindow });
     });
@@ -53,38 +64,38 @@ export default class MenuBuilder {
         { label: 'Services', submenu: [] },
         { type: 'separator' },
         {
-          accelerator: 'Command+H',
           label: 'Hide ElectronReact',
+          accelerator: 'Command+H',
           selector: 'hide:',
         },
         {
-          accelerator: 'Command+Shift+H',
           label: 'Hide Others',
+          accelerator: 'Command+Shift+H',
           selector: 'hideOtherApplications:',
         },
         { label: 'Show All', selector: 'unhideAllApplications:' },
         { type: 'separator' },
         {
+          label: 'Quit',
           accelerator: 'Command+Q',
           click: () => {
             app.quit();
           },
-          label: 'Quit',
         },
       ],
     };
     const subMenuEdit: DarwinMenuItemConstructorOptions = {
       label: 'Edit',
       submenu: [
-        { accelerator: 'Command+Z', label: 'Undo', selector: 'undo:' },
-        { accelerator: 'Shift+Command+Z', label: 'Redo', selector: 'redo:' },
+        { label: 'Undo', accelerator: 'Command+Z', selector: 'undo:' },
+        { label: 'Redo', accelerator: 'Shift+Command+Z', selector: 'redo:' },
         { type: 'separator' },
-        { accelerator: 'Command+X', label: 'Cut', selector: 'cut:' },
-        { accelerator: 'Command+C', label: 'Copy', selector: 'copy:' },
-        { accelerator: 'Command+V', label: 'Paste', selector: 'paste:' },
+        { label: 'Cut', accelerator: 'Command+X', selector: 'cut:' },
+        { label: 'Copy', accelerator: 'Command+C', selector: 'copy:' },
+        { label: 'Paste', accelerator: 'Command+V', selector: 'paste:' },
         {
-          accelerator: 'Command+A',
           label: 'Select All',
+          accelerator: 'Command+A',
           selector: 'selectAll:',
         },
       ],
@@ -93,25 +104,25 @@ export default class MenuBuilder {
       label: 'View',
       submenu: [
         {
+          label: 'Reload',
           accelerator: 'Command+R',
           click: () => {
             this.mainWindow.webContents.reload();
           },
-          label: 'Reload',
         },
         {
+          label: 'Toggle Full Screen',
           accelerator: 'Ctrl+Command+F',
           click: () => {
             this.mainWindow.setFullScreen(!this.mainWindow.isFullScreen());
           },
-          label: 'Toggle Full Screen',
         },
         {
+          label: 'Toggle Developer Tools',
           accelerator: 'Alt+Command+I',
           click: () => {
             this.mainWindow.webContents.toggleDevTools();
           },
-          label: 'Toggle Developer Tools',
         },
       ],
     };
@@ -119,11 +130,11 @@ export default class MenuBuilder {
       label: 'View',
       submenu: [
         {
+          label: 'Toggle Full Screen',
           accelerator: 'Ctrl+Command+F',
           click: () => {
             this.mainWindow.setFullScreen(!this.mainWindow.isFullScreen());
           },
-          label: 'Toggle Full Screen',
         },
       ],
     };
@@ -131,11 +142,11 @@ export default class MenuBuilder {
       label: 'Window',
       submenu: [
         {
-          accelerator: 'Command+M',
           label: 'Minimize',
+          accelerator: 'Command+M',
           selector: 'performMiniaturize:',
         },
-        { accelerator: 'Command+W', label: 'Close', selector: 'performClose:' },
+        { label: 'Close', accelerator: 'Command+W', selector: 'performClose:' },
         { type: 'separator' },
         { label: 'Bring All to Front', selector: 'arrangeInFront:' },
       ],
@@ -144,34 +155,37 @@ export default class MenuBuilder {
       label: 'Help',
       submenu: [
         {
+          label: 'Learn More',
           click() {
             shell.openExternal('https://electronjs.org');
           },
-          label: 'Learn More',
         },
         {
-          click() {
-            shell.openExternal('https://github.com/electron/electron/tree/main/docs#readme');
-          },
           label: 'Documentation',
+          click() {
+            shell.openExternal(
+              'https://github.com/electron/electron/tree/main/docs#readme'
+            );
+          },
         },
         {
+          label: 'Community Discussions',
           click() {
             shell.openExternal('https://www.electronjs.org/community');
           },
-          label: 'Community Discussions',
         },
         {
+          label: 'Search Issues',
           click() {
             shell.openExternal('https://github.com/electron/electron/issues');
           },
-          label: 'Search Issues',
         },
       ],
     };
 
     const subMenuView =
-      process.env.NODE_ENV === 'development' || process.env.DEBUG_PROD === 'true'
+      process.env.NODE_ENV === 'development' ||
+      process.env.DEBUG_PROD === 'true'
         ? subMenuViewDev
         : subMenuViewProd;
 
@@ -184,52 +198,57 @@ export default class MenuBuilder {
         label: '&File',
         submenu: [
           {
-            accelerator: 'Ctrl+O',
             label: '&Open',
+            accelerator: 'Ctrl+O',
           },
           {
+            label: '&Close',
             accelerator: 'Ctrl+W',
             click: () => {
               this.mainWindow.close();
             },
-            label: '&Close',
           },
         ],
       },
       {
         label: '&View',
         submenu:
-          process.env.NODE_ENV === 'development' || process.env.DEBUG_PROD === 'true'
+          process.env.NODE_ENV === 'development' ||
+          process.env.DEBUG_PROD === 'true'
             ? [
                 {
+                  label: '&Reload',
                   accelerator: 'Ctrl+R',
                   click: () => {
                     this.mainWindow.webContents.reload();
                   },
-                  label: '&Reload',
                 },
                 {
+                  label: 'Toggle &Full Screen',
                   accelerator: 'F11',
                   click: () => {
-                    this.mainWindow.setFullScreen(!this.mainWindow.isFullScreen());
+                    this.mainWindow.setFullScreen(
+                      !this.mainWindow.isFullScreen()
+                    );
                   },
-                  label: 'Toggle &Full Screen',
                 },
                 {
+                  label: 'Toggle &Developer Tools',
                   accelerator: 'Alt+Ctrl+I',
                   click: () => {
                     this.mainWindow.webContents.toggleDevTools();
                   },
-                  label: 'Toggle &Developer Tools',
                 },
               ]
             : [
                 {
+                  label: 'Toggle &Full Screen',
                   accelerator: 'F11',
                   click: () => {
-                    this.mainWindow.setFullScreen(!this.mainWindow.isFullScreen());
+                    this.mainWindow.setFullScreen(
+                      !this.mainWindow.isFullScreen()
+                    );
                   },
-                  label: 'Toggle &Full Screen',
                 },
               ],
       },
@@ -237,28 +256,30 @@ export default class MenuBuilder {
         label: 'Help',
         submenu: [
           {
+            label: 'Learn More',
             click() {
               shell.openExternal('https://electronjs.org');
             },
-            label: 'Learn More',
           },
           {
-            click() {
-              shell.openExternal('https://github.com/electron/electron/tree/main/docs#readme');
-            },
             label: 'Documentation',
+            click() {
+              shell.openExternal(
+                'https://github.com/electron/electron/tree/main/docs#readme'
+              );
+            },
           },
           {
+            label: 'Community Discussions',
             click() {
               shell.openExternal('https://www.electronjs.org/community');
             },
-            label: 'Community Discussions',
           },
           {
+            label: 'Search Issues',
             click() {
               shell.openExternal('https://github.com/electron/electron/issues');
             },
-            label: 'Search Issues',
           },
         ],
       },

src/main/preload.ts

@@ -1,29 +1,11 @@
 import { contextBridge, ipcRenderer, IpcRendererEvent } from 'electron';
-import { PlayerData } from '../renderer/store';
-import { browser } from './preload/browser';
-import { ipc } from './preload/ipc';
-import { localSettings } from './preload/local-settings';
-import { mpvPlayer, mpvPlayerListener } from './preload/mpv-player';
+import { PlayerData } from 'renderer/store';
 
 contextBridge.exposeInMainWorld('electron', {
-  browser,
-  ipc,
   ipcRenderer: {
-    APP_RESTART() {
-      ipcRenderer.send('app-restart');
-    },
-    PLAYER_AUTO_NEXT(data: PlayerData) {
-      ipcRenderer.send('player-auto-next', data);
-    },
     PLAYER_CURRENT_TIME() {
       ipcRenderer.send('player-current-time');
     },
-    PLAYER_MEDIA_KEYS_DISABLE() {
-      ipcRenderer.send('global-media-keys-disable');
-    },
-    PLAYER_MEDIA_KEYS_ENABLE() {
-      ipcRenderer.send('global-media-keys-enable');
-    },
     PLAYER_MUTE() {
       ipcRenderer.send('player-mute');
     },
@@ -57,39 +39,25 @@ contextBridge.exposeInMainWorld('electron', {
     PLAYER_VOLUME(value: number) {
       ipcRenderer.send('player-volume', value);
     },
-    RENDERER_PLAYER_AUTO_NEXT(cb: (event: IpcRendererEvent, data: any) => void) {
-      ipcRenderer.on('renderer-player-auto-next', cb);
-    },
-    RENDERER_PLAYER_CURRENT_TIME(cb: (event: IpcRendererEvent, data: any) => void) {
+    RENDERER_PLAYER_CURRENT_TIME(
+      cb: (event: IpcRendererEvent, data: any) => void
+    ) {
       ipcRenderer.on('renderer-player-current-time', cb);
     },
-    RENDERER_PLAYER_NEXT(cb: (event: IpcRendererEvent, data: any) => void) {
-      ipcRenderer.on('renderer-player-next', cb);
-    },
     RENDERER_PLAYER_PAUSE(cb: (event: IpcRendererEvent, data: any) => void) {
       ipcRenderer.on('renderer-player-pause', cb);
     },
     RENDERER_PLAYER_PLAY(cb: (event: IpcRendererEvent, data: any) => void) {
       ipcRenderer.on('renderer-player-play', cb);
     },
-    RENDERER_PLAYER_PLAY_PAUSE(cb: (event: IpcRendererEvent, data: any) => void) {
-      ipcRenderer.on('renderer-player-play-pause', cb);
-    },
-    RENDERER_PLAYER_PREVIOUS(cb: (event: IpcRendererEvent, data: any) => void) {
-      ipcRenderer.on('renderer-player-previous', cb);
+    RENDERER_PLAYER_SET_QUEUE_NEXT(
+      cb: (event: IpcRendererEvent, data: any) => void
+    ) {
+      ipcRenderer.on('renderer-player-set-queue-next', cb);
     },
     RENDERER_PLAYER_STOP(cb: (event: IpcRendererEvent, data: any) => void) {
       ipcRenderer.on('renderer-player-stop', cb);
     },
-    SETTINGS_GET(data: { property: string }) {
-      return ipcRenderer.invoke('settings-get', data);
-    },
-    SETTINGS_SET(data: { property: string; value: any }) {
-      ipcRenderer.send('settings-set', data);
-    },
-    removeAllListeners(value: string) {
-      ipcRenderer.removeAllListeners(value);
-    },
     windowClose() {
       ipcRenderer.send('window-close');
     },
@@ -103,7 +71,4 @@ contextBridge.exposeInMainWorld('electron', {
       ipcRenderer.send('window-unmaximize');
     },
   },
-  localSettings,
-  mpvPlayer,
-  mpvPlayerListener,
 });

src/main/preload/browser.ts

@@ -1,21 +0,0 @@
-import { ipcRenderer } from 'electron';
-
-const exit = () => {
-  ipcRenderer.send('window-close');
-};
-const maximize = () => {
-  ipcRenderer.send('window-maximize');
-};
-const minimize = () => {
-  ipcRenderer.send('window-minimize');
-};
-const unmaximize = () => {
-  ipcRenderer.send('window-unmaximize');
-};
-
-export const browser = {
-  exit,
-  maximize,
-  minimize,
-  unmaximize,
-};

src/main/preload/ipc.ts

@@ -1,9 +0,0 @@
-import { ipcRenderer } from 'electron';
-
-const removeAllListeners = (channel: string) => {
-  ipcRenderer.removeAllListeners(channel);
-};
-
-export const ipc = {
-  removeAllListeners,
-};

src/main/preload/local-settings.ts

@@ -1,32 +0,0 @@
-import { ipcRenderer } from 'electron';
-import Store from 'electron-store';
-
-const store = new Store();
-
-const set = (property: string, value: string | Record<string, unknown> | boolean | string[]) => {
-  store.set(`${property}`, value);
-};
-
-const get = (property: string) => {
-  return store.get(`${property}`);
-};
-
-const restart = () => {
-  ipcRenderer.send('app-restart');
-};
-
-const enableMediaKeys = () => {
-  ipcRenderer.send('global-media-keys-enable');
-};
-
-const disableMediaKeys = () => {
-  ipcRenderer.send('global-media-keys-disable');
-};
-
-export const localSettings = {
-  disableMediaKeys,
-  enableMediaKeys,
-  get,
-  restart,
-  set,
-};

src/main/preload/mpv-player.ts

@@ -1,112 +0,0 @@
-import { ipcRenderer, IpcRendererEvent } from 'electron';
-import { PlayerData } from '/@/renderer/store';
-
-const autoNext = (data: PlayerData) => {
-  ipcRenderer.send('player-auto-next', data);
-};
-
-const currentTime = () => {
-  ipcRenderer.send('player-current-time');
-};
-const mute = () => {
-  ipcRenderer.send('player-mute');
-};
-const next = () => {
-  ipcRenderer.send('player-next');
-};
-const pause = () => {
-  ipcRenderer.send('player-pause');
-};
-const play = () => {
-  ipcRenderer.send('player-play');
-};
-const previous = () => {
-  ipcRenderer.send('player-previous');
-};
-const seek = (seconds: number) => {
-  ipcRenderer.send('player-seek', seconds);
-};
-const seekTo = (seconds: number) => {
-  ipcRenderer.send('player-seek-to', seconds);
-};
-const setQueue = (data: PlayerData) => {
-  ipcRenderer.send('player-set-queue', data);
-};
-const setQueueNext = (data: PlayerData) => {
-  ipcRenderer.send('player-set-queue-next', data);
-};
-const stop = () => {
-  ipcRenderer.send('player-stop');
-};
-const volume = (value: number) => {
-  ipcRenderer.send('player-volume', value);
-};
-
-const quit = () => {
-  ipcRenderer.send('player-quit');
-};
-
-const rendererAutoNext = (cb: (event: IpcRendererEvent, data: PlayerData) => void) => {
-  ipcRenderer.on('renderer-player-auto-next', cb);
-};
-
-const rendererCurrentTime = (cb: (event: IpcRendererEvent, data: number) => void) => {
-  ipcRenderer.on('renderer-player-current-time', cb);
-};
-
-const rendererNext = (cb: (event: IpcRendererEvent, data: PlayerData) => void) => {
-  ipcRenderer.on('renderer-player-next', cb);
-};
-
-const rendererPause = (cb: (event: IpcRendererEvent, data: PlayerData) => void) => {
-  ipcRenderer.on('renderer-player-pause', cb);
-};
-
-const rendererPlay = (cb: (event: IpcRendererEvent, data: PlayerData) => void) => {
-  ipcRenderer.on('renderer-player-play', cb);
-};
-
-const rendererPlayPause = (cb: (event: IpcRendererEvent, data: PlayerData) => void) => {
-  ipcRenderer.on('renderer-player-play-pause', cb);
-};
-
-const rendererPrevious = (cb: (event: IpcRendererEvent, data: PlayerData) => void) => {
-  ipcRenderer.on('renderer-player-previous', cb);
-};
-
-const rendererStop = (cb: (event: IpcRendererEvent, data: PlayerData) => void) => {
-  ipcRenderer.on('renderer-player-stop', cb);
-};
-
-const rendererQuit = (cb: (event: IpcRendererEvent) => void) => {
-  ipcRenderer.on('renderer-player-quit', cb);
-};
-
-export const mpvPlayer = {
-  autoNext,
-  currentTime,
-  mute,
-  next,
-  pause,
-  play,
-  previous,
-  quit,
-  seek,
-  seekTo,
-  setQueue,
-  setQueueNext,
-  stop,
-  volume,
-};
-
-export const mpvPlayerListener = {
-  rendererAutoNext,
-  rendererCurrentTime,
-  rendererNext,
-  rendererPause,
-  rendererPlay,
-  rendererPlayPause,
-  rendererPrevious,
-  rendererQuit,
-  rendererStop,
-};

src/renderer/api/albumsApi.ts

@@ -0,0 +1,28 @@
+import { api } from 'renderer/lib';
+import { AlbumsResponse, BasePaginationRequest } from './types';
+
+export interface AlbumsRequest extends BasePaginationRequest {
+  orderBy: string;
+  serverFolderIds?: string;
+  sortBy: string;
+}
+
+const getAlbum = async (params: { id: number }, signal?: AbortSignal) => {
+  const { data } = await api.get<AlbumsResponse>(`/albums/${params.id}`, {
+    signal,
+  });
+  return data;
+};
+
+const getAlbums = async (params: AlbumsRequest, signal?: AbortSignal) => {
+  const { data } = await api.get<AlbumsResponse>(`/albums`, {
+    params,
+    signal,
+  });
+  return data;
+};
+
+export const albumsApi = {
+  getAlbum,
+  getAlbums,
+};

src/renderer/api/authApi.ts

@@ -0,0 +1,38 @@
+// import axios from 'axios';
+import axios from 'axios';
+import { LoginResponse, PingResponse } from './types';
+
+const login = async (
+  serverUrl: string,
+  body: {
+    password: string;
+    username: string;
+  }
+) => {
+  const { data } = await axios.post<LoginResponse>(
+    `${serverUrl}/api/auth/login`,
+    body
+  );
+
+  return data;
+};
+
+const ping = async (serverUrl: string) => {
+  const { data } = await axios.get<PingResponse>(`${serverUrl}/api/auth/ping`, {
+    timeout: 2000,
+  });
+
+  return data;
+};
+
+const refresh = async (serverUrl: string, body: { refreshToken: string }) => {
+  const { data } = await axios.post(`${serverUrl}/api/auth/refresh`, body);
+
+  return data;
+};
+
+export const authApi = {
+  login,
+  ping,
+  refresh,
+};

src/renderer/api/controller.ts

@@ -1,200 +0,0 @@
-import { useAuthStore } from '/@/renderer/store';
-import { navidromeApi } from '/@/renderer/api/navidrome.api';
-import { toast } from '/@/renderer/components/toast';
-import type {
-  AlbumDetailArgs,
-  RawAlbumDetailResponse,
-  RawAlbumListResponse,
-  AlbumListArgs,
-  SongListArgs,
-  RawSongListResponse,
-  SongDetailArgs,
-  RawSongDetailResponse,
-  AlbumArtistDetailArgs,
-  RawAlbumArtistDetailResponse,
-  AlbumArtistListArgs,
-  RawAlbumArtistListResponse,
-  RatingArgs,
-  RawRatingResponse,
-  FavoriteArgs,
-  RawFavoriteResponse,
-  GenreListArgs,
-  RawGenreListResponse,
-  CreatePlaylistArgs,
-  RawCreatePlaylistResponse,
-  DeletePlaylistArgs,
-  RawDeletePlaylistResponse,
-  PlaylistDetailArgs,
-  RawPlaylistDetailResponse,
-  PlaylistListArgs,
-  RawPlaylistListResponse,
-  MusicFolderListArgs,
-  RawMusicFolderListResponse,
-  PlaylistSongListArgs,
-  ArtistListArgs,
-  RawArtistListResponse,
-} from '/@/renderer/api/types';
-import { subsonicApi } from '/@/renderer/api/subsonic.api';
-import { jellyfinApi } from '/@/renderer/api/jellyfin.api';
-
-export type ControllerEndpoint = Partial<{
-  clearPlaylist: () => void;
-  createFavorite: (args: FavoriteArgs) => Promise<RawFavoriteResponse>;
-  createPlaylist: (args: CreatePlaylistArgs) => Promise<RawCreatePlaylistResponse>;
-  deleteFavorite: (args: FavoriteArgs) => Promise<RawFavoriteResponse>;
-  deletePlaylist: (args: DeletePlaylistArgs) => Promise<RawDeletePlaylistResponse>;
-  getAlbumArtistDetail: (args: AlbumArtistDetailArgs) => Promise<RawAlbumArtistDetailResponse>;
-  getAlbumArtistList: (args: AlbumArtistListArgs) => Promise<RawAlbumArtistListResponse>;
-  getAlbumDetail: (args: AlbumDetailArgs) => Promise<RawAlbumDetailResponse>;
-  getAlbumList: (args: AlbumListArgs) => Promise<RawAlbumListResponse>;
-  getArtistDetail: () => void;
-  getArtistList: (args: ArtistListArgs) => Promise<RawArtistListResponse>;
-  getFavoritesList: () => void;
-  getFolderItemList: () => void;
-  getFolderList: () => void;
-  getFolderSongs: () => void;
-  getGenreList: (args: GenreListArgs) => Promise<RawGenreListResponse>;
-  getMusicFolderList: (args: MusicFolderListArgs) => Promise<RawMusicFolderListResponse>;
-  getPlaylistDetail: (args: PlaylistDetailArgs) => Promise<RawPlaylistDetailResponse>;
-  getPlaylistList: (args: PlaylistListArgs) => Promise<RawPlaylistListResponse>;
-  getPlaylistSongList: (args: PlaylistSongListArgs) => Promise<RawSongListResponse>;
-  getSongDetail: (args: SongDetailArgs) => Promise<RawSongDetailResponse>;
-  getSongList: (args: SongListArgs) => Promise<RawSongListResponse>;
-  updatePlaylist: () => void;
-  updateRating: (args: RatingArgs) => Promise<RawRatingResponse>;
-}>;
-
-type ApiController = {
-  jellyfin: ControllerEndpoint;
-  navidrome: ControllerEndpoint;
-  subsonic: ControllerEndpoint;
-};
-
-const endpoints: ApiController = {
-  jellyfin: {
-    clearPlaylist: undefined,
-    createFavorite: jellyfinApi.createFavorite,
-    createPlaylist: jellyfinApi.createPlaylist,
-    deleteFavorite: jellyfinApi.deleteFavorite,
-    deletePlaylist: jellyfinApi.deletePlaylist,
-    getAlbumArtistDetail: jellyfinApi.getAlbumArtistDetail,
-    getAlbumArtistList: jellyfinApi.getAlbumArtistList,
-    getAlbumDetail: jellyfinApi.getAlbumDetail,
-    getAlbumList: jellyfinApi.getAlbumList,
-    getArtistDetail: undefined,
-    getArtistList: jellyfinApi.getArtistList,
-    getFavoritesList: undefined,
-    getFolderItemList: undefined,
-    getFolderList: undefined,
-    getFolderSongs: undefined,
-    getGenreList: jellyfinApi.getGenreList,
-    getMusicFolderList: jellyfinApi.getMusicFolderList,
-    getPlaylistDetail: jellyfinApi.getPlaylistDetail,
-    getPlaylistList: jellyfinApi.getPlaylistList,
-    getPlaylistSongList: jellyfinApi.getPlaylistSongList,
-    getSongDetail: undefined,
-    getSongList: jellyfinApi.getSongList,
-    updatePlaylist: undefined,
-    updateRating: undefined,
-  },
-  navidrome: {
-    clearPlaylist: undefined,
-    createFavorite: subsonicApi.createFavorite,
-    createPlaylist: navidromeApi.createPlaylist,
-    deleteFavorite: subsonicApi.deleteFavorite,
-    deletePlaylist: navidromeApi.deletePlaylist,
-    getAlbumArtistDetail: navidromeApi.getAlbumArtistDetail,
-    getAlbumArtistList: navidromeApi.getAlbumArtistList,
-    getAlbumDetail: navidromeApi.getAlbumDetail,
-    getAlbumList: navidromeApi.getAlbumList,
-    getArtistDetail: undefined,
-    getArtistList: undefined,
-    getFavoritesList: undefined,
-    getFolderItemList: undefined,
-    getFolderList: undefined,
-    getFolderSongs: undefined,
-    getGenreList: navidromeApi.getGenreList,
-    getMusicFolderList: subsonicApi.getMusicFolderList,
-    getPlaylistDetail: navidromeApi.getPlaylistDetail,
-    getPlaylistList: navidromeApi.getPlaylistList,
-    getPlaylistSongList: navidromeApi.getPlaylistSongList,
-    getSongDetail: navidromeApi.getSongDetail,
-    getSongList: navidromeApi.getSongList,
-    updatePlaylist: undefined,
-    updateRating: subsonicApi.updateRating,
-  },
-  subsonic: {
-    clearPlaylist: undefined,
-    createFavorite: subsonicApi.createFavorite,
-    createPlaylist: undefined,
-    deleteFavorite: subsonicApi.deleteFavorite,
-    deletePlaylist: undefined,
-    getAlbumArtistDetail: subsonicApi.getAlbumArtistDetail,
-    getAlbumArtistList: subsonicApi.getAlbumArtistList,
-    getAlbumDetail: subsonicApi.getAlbumDetail,
-    getAlbumList: subsonicApi.getAlbumList,
-    getArtistDetail: undefined,
-    getArtistList: undefined,
-    getFavoritesList: undefined,
-    getFolderItemList: undefined,
-    getFolderList: undefined,
-    getFolderSongs: undefined,
-    getGenreList: undefined,
-    getMusicFolderList: subsonicApi.getMusicFolderList,
-    getPlaylistDetail: undefined,
-    getPlaylistList: undefined,
-    getSongDetail: undefined,
-    getSongList: undefined,
-    updatePlaylist: undefined,
-    updateRating: undefined,
-  },
-};
-
-const apiController = (endpoint: keyof ControllerEndpoint) => {
-  const serverType = useAuthStore.getState().currentServer?.type;
-
-  if (!serverType) {
-    toast.error({ message: 'No server selected', title: 'Unable to route request' });
-    return () => undefined;
-  }
-
-  const controllerFn = endpoints[serverType][endpoint];
-
-  if (typeof controllerFn !== 'function') {
-    toast.error({
-      message: `Endpoint ${endpoint} is not implemented for ${serverType}`,
-      title: 'Unable to route request',
-    });
-    return () => undefined;
-  }
-
-  return endpoints[serverType][endpoint];
-};
-
-const getAlbumList = async (args: AlbumListArgs) => {
-  return (apiController('getAlbumList') as ControllerEndpoint['getAlbumList'])?.(args);
-};
-
-const getAlbumDetail = async (args: AlbumDetailArgs) => {
-  return (apiController('getAlbumDetail') as ControllerEndpoint['getAlbumDetail'])?.(args);
-};
-
-const getSongList = async (args: SongListArgs) => {
-  return (apiController('getSongList') as ControllerEndpoint['getSongList'])?.(args);
-};
-
-const getMusicFolderList = async (args: MusicFolderListArgs) => {
-  return (apiController('getMusicFolderList') as ControllerEndpoint['getMusicFolderList'])?.(args);
-};
-
-const getGenreList = async (args: GenreListArgs) => {
-  return (apiController('getGenreList') as ControllerEndpoint['getGenreList'])?.(args);
-};
-
-export const controller = {
-  getAlbumDetail,
-  getAlbumList,
-  getGenreList,
-  getMusicFolderList,
-  getSongList,
-};

src/renderer/api/index.ts

@@ -1,7 +0,0 @@
-import { controller } from '/@/renderer/api/controller';
-import { normalize } from '/@/renderer/api/normalize';
-
-export const api = {
-  controller,
-  normalize,
-};

src/renderer/api/jellyfin.api.ts

@@ -1,721 +0,0 @@
-import ky from 'ky';
-import { nanoid } from 'nanoid/non-secure';
-import type {
-  JFAlbum,
-  JFAlbumArtistDetail,
-  JFAlbumArtistDetailResponse,
-  JFAlbumArtistList,
-  JFAlbumArtistListParams,
-  JFAlbumArtistListResponse,
-  JFAlbumDetail,
-  JFAlbumDetailResponse,
-  JFAlbumList,
-  JFAlbumListParams,
-  JFAlbumListResponse,
-  JFArtistList,
-  JFArtistListParams,
-  JFArtistListResponse,
-  JFAuthenticate,
-  JFCreatePlaylistResponse,
-  JFGenreList,
-  JFGenreListResponse,
-  JFMusicFolderList,
-  JFMusicFolderListResponse,
-  JFPlaylistDetail,
-  JFPlaylistDetailResponse,
-  JFPlaylistList,
-  JFPlaylistListResponse,
-  JFSong,
-  JFSongList,
-  JFSongListParams,
-  JFSongListResponse,
-} from '/@/renderer/api/jellyfin.types';
-import { JFCollectionType } from '/@/renderer/api/jellyfin.types';
-import type {
-  Album,
-  AlbumArtistDetailArgs,
-  AlbumArtistListArgs,
-  AlbumDetailArgs,
-  AlbumListArgs,
-  ArtistListArgs,
-  AuthenticationResponse,
-  CreatePlaylistArgs,
-  CreatePlaylistResponse,
-  DeletePlaylistArgs,
-  FavoriteArgs,
-  FavoriteResponse,
-  GenreListArgs,
-  MusicFolderListArgs,
-  PlaylistDetailArgs,
-  PlaylistListArgs,
-  PlaylistSongListArgs,
-  Song,
-  SongListArgs,
-} from '/@/renderer/api/types';
-import {
-  songListSortMap,
-  albumListSortMap,
-  artistListSortMap,
-  sortOrderMap,
-  albumArtistListSortMap,
-} from '/@/renderer/api/types';
-import { useAuthStore } from '/@/renderer/store';
-import { ServerListItem, ServerType } from '/@/renderer/types';
-import { parseSearchParams } from '/@/renderer/utils';
-
-const getCommaDelimitedString = (value: string[]) => {
-  return value.join(',');
-};
-
-const api = ky.create({});
-
-const authenticate = async (
-  url: string,
-  body: {
-    password: string;
-    username: string;
-  },
-): Promise<AuthenticationResponse> => {
-  const cleanServerUrl = url.replace(/\/$/, '');
-
-  const data = await ky
-    .post(`${cleanServerUrl}/users/authenticatebyname`, {
-      headers: {
-        'X-Emby-Authorization':
-          'MediaBrowser Client="Feishin", Device="PC", DeviceId="Feishin", Version="0.0.1-alpha2"',
-      },
-      json: {
-        pw: body.password,
-        username: body.username,
-      },
-    })
-    .json<JFAuthenticate>();
-
-  return {
-    credential: data.AccessToken,
-    userId: data.User.Id,
-    username: data.User.Name,
-  };
-};
-
-const getMusicFolderList = async (args: MusicFolderListArgs): Promise<JFMusicFolderList> => {
-  const { server, signal } = args;
-  const userId = useAuthStore.getState().currentServer?.userId;
-
-  const data = await api
-    .get(`users/${userId}/items`, {
-      headers: { 'X-MediaBrowser-Token': server?.credential },
-      prefixUrl: server?.url,
-      signal,
-    })
-    .json<JFMusicFolderListResponse>();
-
-  const musicFolders = data.Items.filter(
-    (folder) => folder.CollectionType === JFCollectionType.MUSIC,
-  );
-
-  return musicFolders;
-};
-
-const getGenreList = async (args: GenreListArgs): Promise<JFGenreList> => {
-  const { signal, server } = args;
-
-  const data = await api
-    .get('genres', {
-      headers: { 'X-MediaBrowser-Token': server?.credential },
-      prefixUrl: server?.url,
-      signal,
-    })
-    .json<JFGenreListResponse>();
-  return data;
-};
-
-const getAlbumArtistDetail = async (args: AlbumArtistDetailArgs): Promise<JFAlbumArtistDetail> => {
-  const { query, server, signal } = args;
-
-  const searchParams = {
-    fields: 'Genres',
-  };
-
-  const data = await api
-    .get(`/users/${server?.userId}/items/${query.id}`, {
-      headers: { 'X-MediaBrowser-Token': server?.credential },
-      prefixUrl: server?.url,
-      searchParams: parseSearchParams(searchParams),
-      signal,
-    })
-    .json<JFAlbumArtistDetailResponse>();
-
-  return data;
-};
-
-// const getAlbumArtistAlbums = () => {
-//   const { data: albumData } = await api.get(`/users/${auth.username}/items`, {
-//     params: {
-//       artistIds: options.id,
-//       fields: 'AudioInfo, ParentId, Genres, DateCreated, ChildCount, ParentId',
-//       includeItemTypes: 'MusicAlbum',
-//       parentId: options.musicFolderId,
-//       recursive: true,
-//       sortBy: 'SortName',
-//     },
-//   });
-
-//   const { data: similarData } = await api.get(`/artists/${options.id}/similar`, {
-//     params: { limit: 15, parentId: options.musicFolderId, userId: auth.username },
-//   });
-// };
-
-const getAlbumArtistList = async (args: AlbumArtistListArgs): Promise<JFAlbumArtistList> => {
-  const { query, server, signal } = args;
-
-  const searchParams: JFAlbumArtistListParams = {
-    limit: query.limit,
-    parentId: query.musicFolderId,
-    recursive: true,
-    sortBy: albumArtistListSortMap.jellyfin[query.sortBy],
-    sortOrder: sortOrderMap.jellyfin[query.sortOrder],
-    startIndex: query.startIndex,
-  };
-
-  const data = await api
-    .get('artists/albumArtists', {
-      headers: { 'X-MediaBrowser-Token': server?.credential },
-      prefixUrl: server?.url,
-      searchParams: parseSearchParams(searchParams),
-      signal,
-    })
-    .json<JFAlbumArtistListResponse>();
-
-  return data;
-};
-
-const getArtistList = async (args: ArtistListArgs): Promise<JFArtistList> => {
-  const { query, server, signal } = args;
-
-  const searchParams: JFArtistListParams = {
-    limit: query.limit,
-    parentId: query.musicFolderId,
-    recursive: true,
-    sortBy: artistListSortMap.jellyfin[query.sortBy],
-    sortOrder: sortOrderMap.jellyfin[query.sortOrder],
-    startIndex: query.startIndex,
-  };
-
-  const data = await api
-    .get('artists', {
-      headers: { 'X-MediaBrowser-Token': server?.credential },
-      prefixUrl: server?.url,
-      searchParams: parseSearchParams(searchParams),
-      signal,
-    })
-    .json<JFArtistListResponse>();
-
-  return data;
-};
-
-const getAlbumDetail = async (args: AlbumDetailArgs): Promise<JFAlbumDetail> => {
-  const { query, server, signal } = args;
-
-  const searchParams = {
-    fields: 'Genres, DateCreated, ChildCount',
-  };
-
-  const data = await api
-    .get(`users/${server?.userId}/items/${query.id}`, {
-      headers: { 'X-MediaBrowser-Token': server?.credential },
-      prefixUrl: server?.url,
-      searchParams,
-      signal,
-    })
-    .json<JFAlbumDetailResponse>();
-
-  const songsSearchParams = {
-    fields: 'Genres, DateCreated, MediaSources, ParentId',
-    parentId: query.id,
-    sortBy: 'SortName',
-  };
-
-  const songsData = await api
-    .get(`users/${server?.userId}/items`, {
-      headers: { 'X-MediaBrowser-Token': server?.credential },
-      prefixUrl: server?.url,
-      searchParams: songsSearchParams,
-      signal,
-    })
-    .json<JFSongListResponse>();
-
-  return { ...data, songs: songsData.Items };
-};
-
-const getAlbumList = async (args: AlbumListArgs): Promise<JFAlbumList> => {
-  const { query, server, signal } = args;
-
-  const yearsGroup = [];
-  if (query.jfParams?.minYear && query.jfParams?.maxYear) {
-    for (let i = Number(query.jfParams.minYear); i <= Number(query.jfParams.maxYear); i += 1) {
-      yearsGroup.push(String(i));
-    }
-  }
-
-  const yearsFilter = yearsGroup.length ? yearsGroup.join(',') : undefined;
-
-  const searchParams: JFAlbumListParams & { maxYear?: number; minYear?: number } = {
-    includeItemTypes: 'MusicAlbum',
-    limit: query.limit,
-    parentId: query.musicFolderId,
-    recursive: true,
-    searchTerm: query.searchTerm,
-    sortBy: albumListSortMap.jellyfin[query.sortBy],
-    sortOrder: sortOrderMap.jellyfin[query.sortOrder],
-    startIndex: query.startIndex,
-    ...query.jfParams,
-    maxYear: undefined,
-    minYear: undefined,
-    years: yearsFilter,
-  };
-
-  const data = await api
-    .get(`users/${server?.userId}/items`, {
-      headers: { 'X-MediaBrowser-Token': server?.credential },
-      prefixUrl: server?.url,
-      searchParams: parseSearchParams(searchParams),
-      signal,
-    })
-    .json<JFAlbumListResponse>();
-
-  return {
-    items: data.Items,
-    startIndex: query.startIndex,
-    totalRecordCount: data.TotalRecordCount,
-  };
-};
-
-const getSongList = async (args: SongListArgs): Promise<JFSongList> => {
-  const { query, server, signal } = args;
-
-  const yearsGroup = [];
-  if (query.jfParams?.minYear && query.jfParams?.maxYear) {
-    for (let i = Number(query.jfParams.minYear); i <= Number(query.jfParams.maxYear); i += 1) {
-      yearsGroup.push(String(i));
-    }
-  }
-
-  const yearsFilter = yearsGroup.length ? getCommaDelimitedString(yearsGroup) : undefined;
-  const albumIdsFilter = query.albumIds ? getCommaDelimitedString(query.albumIds) : undefined;
-
-  const searchParams: JFSongListParams & { maxYear?: number; minYear?: number } = {
-    albumIds: albumIdsFilter,
-    fields: 'Genres, DateCreated, MediaSources, ParentId',
-    includeItemTypes: 'Audio',
-    limit: query.limit,
-    parentId: query.musicFolderId,
-    recursive: true,
-    searchTerm: query.searchTerm,
-    sortBy: songListSortMap.jellyfin[query.sortBy],
-    sortOrder: sortOrderMap.jellyfin[query.sortOrder],
-    startIndex: query.startIndex,
-    ...query.jfParams,
-    maxYear: undefined,
-    minYear: undefined,
-    years: yearsFilter,
-  };
-
-  const data = await api
-    .get(`users/${server?.userId}/items`, {
-      headers: { 'X-MediaBrowser-Token': server?.credential },
-      prefixUrl: server?.url,
-      searchParams: parseSearchParams(searchParams),
-      signal,
-    })
-    .json<JFSongListResponse>();
-
-  return {
-    items: data.Items,
-    startIndex: query.startIndex,
-    totalRecordCount: data.TotalRecordCount,
-  };
-};
-
-const getPlaylistDetail = async (args: PlaylistDetailArgs): Promise<JFPlaylistDetail> => {
-  const { query, server, signal } = args;
-
-  const searchParams = {
-    fields: 'Genres, DateCreated, MediaSources, ChildCount, ParentId',
-    ids: query.id,
-  };
-
-  const data = await api
-    .get(`users/${server?.userId}/items/${query.id}`, {
-      headers: { 'X-MediaBrowser-Token': server?.credential },
-      prefixUrl: server?.url,
-      searchParams,
-      signal,
-    })
-    .json<JFPlaylistDetailResponse>();
-
-  return data;
-};
-
-const getPlaylistSongList = async (args: PlaylistSongListArgs): Promise<JFSongList> => {
-  const { query, server, signal } = args;
-
-  const searchParams: JFSongListParams = {
-    fields: 'Genres, DateCreated, MediaSources, UserData, ParentId',
-    includeItemTypes: 'Audio',
-    sortOrder: query.sortOrder ? sortOrderMap.jellyfin[query.sortOrder] : undefined,
-    startIndex: 0,
-  };
-
-  const data = await api
-    .get(`playlists/${query.id}/items`, {
-      headers: { 'X-MediaBrowser-Token': server?.credential },
-      prefixUrl: server?.url,
-      searchParams: parseSearchParams(searchParams),
-      signal,
-    })
-    .json<JFSongListResponse>();
-
-  return {
-    items: data.Items,
-    startIndex: query.startIndex,
-    totalRecordCount: data.TotalRecordCount,
-  };
-};
-
-const getPlaylistList = async (args: PlaylistListArgs): Promise<JFPlaylistList> => {
-  const { server, signal } = args;
-
-  const searchParams = {
-    fields: 'ChildCount, Genres, DateCreated, ParentId, Overview',
-    includeItemTypes: 'Playlist',
-    recursive: true,
-    sortBy: 'SortName',
-    sortOrder: 'Ascending',
-  };
-
-  const data = await api
-    .get(`/users/${server?.userId}/items`, {
-      headers: { 'X-MediaBrowser-Token': server?.credential },
-      prefixUrl: server?.url,
-      searchParams: parseSearchParams(searchParams),
-      signal,
-    })
-    .json<JFPlaylistListResponse>();
-
-  const playlistData = data.Items.filter((item) => item.MediaType === 'Audio');
-
-  return {
-    Items: playlistData,
-    StartIndex: 0,
-    TotalRecordCount: playlistData.length,
-  };
-};
-
-const createPlaylist = async (args: CreatePlaylistArgs): Promise<CreatePlaylistResponse> => {
-  const { query, server } = args;
-
-  const body = {
-    MediaType: 'Audio',
-    Name: query.name,
-    UserId: server?.userId,
-  };
-
-  const data = await api
-    .post('playlists', {
-      headers: { 'X-MediaBrowser-Token': server?.credential },
-      json: body,
-      prefixUrl: server?.url,
-    })
-    .json<JFCreatePlaylistResponse>();
-
-  return {
-    id: data.Id,
-    name: query.name,
-  };
-};
-
-const deletePlaylist = async (args: DeletePlaylistArgs): Promise<null> => {
-  const { query, server } = args;
-
-  await api.delete(`items/${query.id}`, {
-    headers: { 'X-MediaBrowser-Token': server?.credential },
-    prefixUrl: server?.url,
-  });
-
-  return null;
-};
-
-const createFavorite = async (args: FavoriteArgs): Promise<FavoriteResponse> => {
-  const { query, server } = args;
-
-  await api.post(`users/${server?.userId}/favoriteitems/${query.id}`, {
-    headers: { 'X-MediaBrowser-Token': server?.credential },
-    prefixUrl: server?.url,
-  });
-
-  return {
-    id: query.id,
-  };
-};
-
-const deleteFavorite = async (args: FavoriteArgs): Promise<FavoriteResponse> => {
-  const { query, server } = args;
-
-  await api.delete(`users/${server?.userId}/favoriteitems/${query.id}`, {
-    headers: { 'X-MediaBrowser-Token': server?.credential },
-    prefixUrl: server?.url,
-  });
-
-  return {
-    id: query.id,
-  };
-};
-
-const getStreamUrl = (args: {
-  container?: string;
-  deviceId: string;
-  eTag?: string;
-  id: string;
-  mediaSourceId?: string;
-  server: ServerListItem;
-}) => {
-  const { id, server, deviceId } = args;
-
-  return (
-    `${server?.url}/audio` +
-    `/${id}/universal` +
-    `?userId=${server.userId}` +
-    `&deviceId=${deviceId}` +
-    '&audioCodec=aac' +
-    `&api_key=${server.credential}` +
-    `&playSessionId=${deviceId}` +
-    '&container=opus,mp3,aac,m4a,m4b,flac,wav,ogg' +
-    '&transcodingContainer=ts' +
-    '&transcodingProtocol=hls'
-  );
-};
-
-const getAlbumCoverArtUrl = (args: { baseUrl: string; item: JFAlbum; size: number }) => {
-  const size = args.size ? args.size : 300;
-
-  if (!args.item.ImageTags?.Primary && !args.item?.AlbumPrimaryImageTag) {
-    return null;
-  }
-
-  return (
-    `${args.baseUrl}/Items` +
-    `/${args.item.Id}` +
-    '/Images/Primary' +
-    `?width=${size}&height=${size}` +
-    '&quality=96'
-  );
-};
-
-const getSongCoverArtUrl = (args: { baseUrl: string; item: JFSong; size: number }) => {
-  const size = args.size ? args.size : 300;
-
-  if (!args.item.ImageTags?.Primary) {
-    return null;
-  }
-
-  if (args.item.ImageTags.Primary) {
-    return (
-      `${args.baseUrl}/Items` +
-      `/${args.item.Id}` +
-      '/Images/Primary' +
-      `?width=${size}&height=${size}` +
-      '&quality=96'
-    );
-  }
-
-  if (!args.item?.AlbumPrimaryImageTag) {
-    return null;
-  }
-
-  // Fall back to album art if no image embedded
-  return (
-    `${args.baseUrl}/Items` +
-    `/${args.item?.AlbumId}` +
-    '/Images/Primary' +
-    `?width=${size}&height=${size}` +
-    '&quality=96'
-  );
-};
-
-const normalizeSong = (
-  item: JFSong,
-  server: ServerListItem,
-  deviceId: string,
-  imageSize?: number,
-): Song => {
-  return {
-    album: item.Album,
-    albumArtists: item.AlbumArtists?.map((entry) => ({ id: entry.Id, name: entry.Name })),
-    albumId: item.AlbumId,
-    artistName: item.ArtistItems[0]?.Name,
-    artists: item.ArtistItems.map((entry) => ({ id: entry.Id, name: entry.Name })),
-    bitRate: item.MediaSources && Number(Math.trunc(item.MediaSources[0]?.Bitrate / 1000)),
-    bpm: null,
-    channels: null,
-    compilation: null,
-    container: (item.MediaSources && item.MediaSources[0]?.Container) || null,
-    createdAt: item.DateCreated,
-    discNumber: (item.ParentIndexNumber && item.ParentIndexNumber) || 1,
-    duration: item.RunTimeTicks / 10000000,
-    genres: item.GenreItems.map((entry: any) => ({ id: entry.Id, name: entry.Name })),
-    id: item.Id,
-    imageUrl: getSongCoverArtUrl({ baseUrl: server.url, item, size: imageSize || 300 }),
-    isFavorite: (item.UserData && item.UserData.IsFavorite) || false,
-    lastPlayedAt: null,
-    name: item.Name,
-    note: null,
-    path: (item.MediaSources && item.MediaSources[0]?.Path) || null,
-    playCount: (item.UserData && item.UserData.PlayCount) || 0,
-    // releaseDate: (item.ProductionYear && new Date(item.ProductionYear, 0, 1).toISOString()) || null,
-    releaseDate: null,
-    releaseYear: (item.ProductionYear && String(item.ProductionYear)) || null,
-    serverId: server.id,
-    size: item.MediaSources && item.MediaSources[0]?.Size,
-    streamUrl: getStreamUrl({
-      container: item.MediaSources[0]?.Container,
-      deviceId,
-      eTag: item.MediaSources[0]?.ETag,
-      id: item.Id,
-      mediaSourceId: item.MediaSources[0]?.Id,
-      server,
-    }),
-    trackNumber: item.IndexNumber,
-    type: ServerType.JELLYFIN,
-    uniqueId: nanoid(),
-    updatedAt: item.DateCreated,
-  };
-};
-
-const normalizeAlbum = (item: JFAlbum, server: ServerListItem, imageSize?: number): Album => {
-  return {
-    albumArtists:
-      item.AlbumArtists.map((entry) => ({
-        id: entry.Id,
-        name: entry.Name,
-      })) || [],
-    artists: item.ArtistItems?.map((entry) => ({ id: entry.Id, name: entry.Name })),
-    backdropImageUrl: null,
-    createdAt: item.DateCreated,
-    duration: item.RunTimeTicks / 10000000,
-    genres: item.GenreItems?.map((entry) => ({ id: entry.Id, name: entry.Name })),
-    id: item.Id,
-    imagePlaceholderUrl: null,
-    imageUrl: getAlbumCoverArtUrl({
-      baseUrl: server.url,
-      item,
-      size: imageSize || 300,
-    }),
-    isCompilation: null,
-    isFavorite: item.UserData?.IsFavorite || false,
-    lastPlayedAt: null,
-    name: item.Name,
-    playCount: item.UserData?.PlayCount || 0,
-    rating: null,
-    releaseDate: item.PremiereDate?.split('T')[0] || null,
-    releaseYear: item.ProductionYear,
-    serverType: ServerType.JELLYFIN,
-    size: null,
-    songCount: item?.ChildCount || null,
-    songs: item.songs?.map((song) => normalizeSong(song, server, '', imageSize)),
-    uniqueId: nanoid(),
-    updatedAt: item?.DateLastMediaAdded || item.DateCreated,
-  };
-};
-
-// const normalizeArtist = (item: any) => {
-//   return {
-//     album: (item.album || []).map((entry: any) => normalizeAlbum(entry)),
-//     albumCount: item.AlbumCount,
-//     duration: item.RunTimeTicks / 10000000,
-//     genre: item.GenreItems && item.GenreItems.map((entry: any) => normalizeItem(entry)),
-//     id: item.Id,
-//     image: getCoverArtUrl(item),
-//     info: {
-//       biography: item.Overview,
-//       externalUrl: (item.ExternalUrls || []).map((entry: any) => normalizeItem(entry)),
-//       imageUrl: undefined,
-//       similarArtist: (item.similarArtist || []).map((entry: any) => normalizeArtist(entry)),
-//     },
-//     starred: item.UserData && item.UserData?.IsFavorite ? 'true' : undefined,
-//     title: item.Name,
-//     uniqueId: nanoid(),
-//   };
-// };
-
-// const normalizePlaylist = (item: any) => {
-//   return {
-//     changed: item.DateLastMediaAdded,
-//     comment: item.Overview,
-//     created: item.DateCreated,
-//     duration: item.RunTimeTicks / 10000000,
-//     genre: item.GenreItems && item.GenreItems.map((entry: any) => normalizeItem(entry)),
-//     id: item.Id,
-//     image: getCoverArtUrl(item, 350),
-//     owner: undefined,
-//     public: undefined,
-//     song: [],
-//     songCount: item.ChildCount,
-//     title: item.Name,
-//     uniqueId: nanoid(),
-//   };
-// };
-
-// const normalizeGenre = (item: any) => {
-//   return {
-//     albumCount: undefined,
-//     id: item.Id,
-//     songCount: undefined,
-//     title: item.Name,
-//     type: Item.Genre,
-//     uniqueId: nanoid(),
-//   };
-// };
-
-// const normalizeFolder = (item: any) => {
-//   return {
-//     created: item.DateCreated,
-//     id: item.Id,
-//     image: getCoverArtUrl(item, 150),
-//     isDir: true,
-//     title: item.Name,
-//     type: Item.Folder,
-//     uniqueId: nanoid(),
-//   };
-// };
-
-// const normalizeScanStatus = () => {
-//   return {
-//     count: 'N/a',
-//     scanning: false,
-//   };
-// };
-
-export const jellyfinApi = {
-  authenticate,
-  createFavorite,
-  createPlaylist,
-  deleteFavorite,
-  deletePlaylist,
-  getAlbumArtistDetail,
-  getAlbumArtistList,
-  getAlbumDetail,
-  getAlbumList,
-  getArtistList,
-  getGenreList,
-  getMusicFolderList,
-  getPlaylistDetail,
-  getPlaylistList,
-  getPlaylistSongList,
-  getSongList,
-};
-
-export const jfNormalize = {
-  album: normalizeAlbum,
-  song: normalizeSong,
-};

src/renderer/api/jellyfin.types.ts

@@ -1,583 +0,0 @@
-export type JFBasePaginatedResponse = {
-  StartIndex: number;
-  TotalRecordCount: number;
-};
-
-export interface JFMusicFolderListResponse extends JFBasePaginatedResponse {
-  Items: JFMusicFolder[];
-}
-
-export type JFMusicFolderList = JFMusicFolder[];
-
-export interface JFGenreListResponse extends JFBasePaginatedResponse {
-  Items: JFGenre[];
-}
-
-export type JFGenreList = JFGenreListResponse;
-
-export type JFAlbumArtistDetailResponse = JFAlbumArtist;
-
-export type JFAlbumArtistDetail = JFAlbumArtistDetailResponse;
-
-export interface JFAlbumArtistListResponse extends JFBasePaginatedResponse {
-  Items: JFAlbumArtist[];
-}
-
-export type JFAlbumArtistList = JFAlbumArtistListResponse;
-
-export interface JFArtistListResponse extends JFBasePaginatedResponse {
-  Items: JFAlbumArtist[];
-}
-
-export type JFArtistList = JFArtistListResponse;
-
-export interface JFAlbumListResponse extends JFBasePaginatedResponse {
-  Items: JFAlbum[];
-}
-
-export type JFAlbumList = {
-  items: JFAlbum[];
-  startIndex: number;
-  totalRecordCount: number;
-};
-
-export type JFAlbumDetailResponse = JFAlbum;
-
-export type JFAlbumDetail = JFAlbum & { songs?: JFSong[] };
-
-export interface JFSongListResponse extends JFBasePaginatedResponse {
-  Items: JFSong[];
-}
-
-export type JFSongList = {
-  items: JFSong[];
-  startIndex: number;
-  totalRecordCount: number;
-};
-
-export interface JFPlaylistListResponse extends JFBasePaginatedResponse {
-  Items: JFPlaylist[];
-}
-
-export type JFPlaylistList = JFPlaylistListResponse;
-
-export type JFPlaylistDetailResponse = JFPlaylist;
-
-export type JFPlaylistDetail = JFPlaylist & { songs?: JFSong[] };
-
-export type JFPlaylist = {
-  BackdropImageTags: string[];
-  ChannelId: null;
-  ChildCount?: number;
-  DateCreated: string;
-  GenreItems: GenreItem[];
-  Genres: string[];
-  Id: string;
-  ImageBlurHashes: ImageBlurHashes;
-  ImageTags: ImageTags;
-  IsFolder: boolean;
-  LocationType: string;
-  MediaType: string;
-  Name: string;
-  RunTimeTicks: number;
-  ServerId: string;
-  Type: string;
-  UserData: UserData;
-};
-
-export type JFRequestParams = {
-  albumArtistIds?: string;
-  artistIds?: string;
-  enableImageTypes?: string;
-  enableTotalRecordCount?: boolean;
-  enableUserData?: boolean;
-  excludeItemTypes?: string;
-  fields?: string;
-  imageTypeLimit?: number;
-  includeItemTypes?: string;
-  isFavorite?: boolean;
-  limit?: number;
-  parentId?: string;
-  recursive?: boolean;
-  searchTerm?: string;
-  sortBy?: string;
-  sortOrder?: 'Ascending' | 'Descending';
-  startIndex?: number;
-  userId?: string;
-};
-
-export type JFMusicFolder = {
-  BackdropImageTags: string[];
-  ChannelId: null;
-  CollectionType: string;
-  Id: string;
-  ImageBlurHashes: ImageBlurHashes;
-  ImageTags: ImageTags;
-  IsFolder: boolean;
-  LocationType: string;
-  Name: string;
-  ServerId: string;
-  Type: string;
-  UserData: UserData;
-};
-
-export type JFGenre = {
-  BackdropImageTags: any[];
-  ChannelId: null;
-  Id: string;
-  ImageBlurHashes: any;
-  ImageTags: ImageTags;
-  LocationType: string;
-  Name: string;
-  ServerId: string;
-  Type: string;
-};
-
-export type JFAlbumArtist = {
-  BackdropImageTags: string[];
-  ChannelId: null;
-  DateCreated: string;
-  ExternalUrls: ExternalURL[];
-  GenreItems: GenreItem[];
-  Genres: string[];
-  Id: string;
-  ImageBlurHashes: any;
-  ImageTags: ImageTags;
-  LocationType: string;
-  Name: string;
-  Overview?: string;
-  RunTimeTicks: number;
-  ServerId: string;
-  Type: string;
-};
-
-export type JFArtist = {
-  BackdropImageTags: string[];
-  ChannelId: null;
-  DateCreated: string;
-  ExternalUrls: ExternalURL[];
-  GenreItems: GenreItem[];
-  Genres: string[];
-  Id: string;
-  ImageBlurHashes: any;
-  ImageTags: string[];
-  LocationType: string;
-  Name: string;
-  Overview?: string;
-  RunTimeTicks: number;
-  ServerId: string;
-  Type: string;
-};
-
-export type JFAlbum = {
-  AlbumArtist: string;
-  AlbumArtists: JFGenericItem[];
-  AlbumPrimaryImageTag: string;
-  ArtistItems: JFGenericItem[];
-  Artists: string[];
-  ChannelId: null;
-  ChildCount?: number;
-  DateCreated: string;
-  DateLastMediaAdded?: string;
-  ExternalUrls: ExternalURL[];
-  GenreItems: JFGenericItem[];
-  Genres: string[];
-  Id: string;
-  ImageBlurHashes: ImageBlurHashes;
-  ImageTags: ImageTags;
-  IsFolder: boolean;
-  LocationType: string;
-  Name: string;
-  ParentLogoImageTag: string;
-  ParentLogoItemId: string;
-  PremiereDate?: string;
-  ProductionYear: number;
-  RunTimeTicks: number;
-  ServerId: string;
-  Type: string;
-  UserData?: UserData;
-} & {
-  songs?: JFSong[];
-};
-
-export type JFSong = {
-  Album: string;
-  AlbumArtist: string;
-  AlbumArtists: JFGenericItem[];
-  AlbumId: string;
-  AlbumPrimaryImageTag: string;
-  ArtistItems: JFGenericItem[];
-  Artists: string[];
-  BackdropImageTags: string[];
-  ChannelId: null;
-  DateCreated: string;
-  ExternalUrls: ExternalURL[];
-  GenreItems: JFGenericItem[];
-  Genres: string[];
-  Id: string;
-  ImageBlurHashes: ImageBlurHashes;
-  ImageTags: ImageTags;
-  IndexNumber: number;
-  IsFolder: boolean;
-  LocationType: string;
-  MediaSources: MediaSources[];
-  MediaType: string;
-  Name: string;
-  ParentIndexNumber: number;
-  PremiereDate?: string;
-  ProductionYear: number;
-  RunTimeTicks: number;
-  ServerId: string;
-  SortName: string;
-  Type: string;
-  UserData?: UserData;
-};
-
-type ImageBlurHashes = {
-  Backdrop?: any;
-  Logo?: any;
-  Primary?: any;
-};
-
-type ImageTags = {
-  Logo?: string;
-  Primary?: string;
-};
-
-type UserData = {
-  IsFavorite: boolean;
-  Key: string;
-  PlayCount: number;
-  PlaybackPositionTicks: number;
-  Played: boolean;
-};
-
-type ExternalURL = {
-  Name: string;
-  Url: string;
-};
-
-type GenreItem = {
-  Id: string;
-  Name: string;
-};
-
-export type JFGenericItem = {
-  Id: string;
-  Name: string;
-};
-
-type MediaSources = {
-  Bitrate: number;
-  Container: string;
-  DefaultAudioStreamIndex: number;
-  ETag: string;
-  Formats: any[];
-  GenPtsInput: boolean;
-  Id: string;
-  IgnoreDts: boolean;
-  IgnoreIndex: boolean;
-  IsInfiniteStream: boolean;
-  IsRemote: boolean;
-  MediaAttachments: any[];
-  MediaStreams: MediaStream[];
-  Name: string;
-  Path: string;
-  Protocol: string;
-  ReadAtNativeFramerate: boolean;
-  RequiredHttpHeaders: any;
-  RequiresClosing: boolean;
-  RequiresLooping: boolean;
-  RequiresOpening: boolean;
-  RunTimeTicks: number;
-  Size: number;
-  SupportsDirectPlay: boolean;
-  SupportsDirectStream: boolean;
-  SupportsProbing: boolean;
-  SupportsTranscoding: boolean;
-  Type: string;
-};
-
-type MediaStream = {
-  AspectRatio?: string;
-  BitDepth?: number;
-  BitRate?: number;
-  ChannelLayout?: string;
-  Channels?: number;
-  Codec: string;
-  CodecTimeBase: string;
-  ColorSpace?: string;
-  Comment?: string;
-  DisplayTitle?: string;
-  Height?: number;
-  Index: number;
-  IsDefault: boolean;
-  IsExternal: boolean;
-  IsForced: boolean;
-  IsInterlaced: boolean;
-  IsTextSubtitleStream: boolean;
-  Level: number;
-  PixelFormat?: string;
-  Profile?: string;
-  RealFrameRate?: number;
-  RefFrames?: number;
-  SampleRate?: number;
-  SupportsExternalStream: boolean;
-  TimeBase: string;
-  Type: string;
-  Width?: number;
-};
-
-export enum JFExternalType {
-  MUSICBRAINZ = 'MusicBrainz',
-  THEAUDIODB = 'TheAudioDb',
-}
-
-export enum JFImageType {
-  LOGO = 'Logo',
-  PRIMARY = 'Primary',
-}
-
-export enum JFItemType {
-  AUDIO = 'Audio',
-  MUSICALBUM = 'MusicAlbum',
-}
-
-export enum JFCollectionType {
-  MUSIC = 'music',
-  PLAYLISTS = 'playlists',
-}
-
-export interface JFAuthenticate {
-  AccessToken: string;
-  ServerId: string;
-  SessionInfo: SessionInfo;
-  User: User;
-}
-
-type SessionInfo = {
-  AdditionalUsers: any[];
-  ApplicationVersion: string;
-  Capabilities: Capabilities;
-  Client: string;
-  DeviceId: string;
-  DeviceName: string;
-  HasCustomDeviceName: boolean;
-  Id: string;
-  IsActive: boolean;
-  LastActivityDate: string;
-  LastPlaybackCheckIn: string;
-  NowPlayingQueue: any[];
-  NowPlayingQueueFullItems: any[];
-  PlayState: PlayState;
-  PlayableMediaTypes: any[];
-  RemoteEndPoint: string;
-  ServerId: string;
-  SupportedCommands: any[];
-  SupportsMediaControl: boolean;
-  SupportsRemoteControl: boolean;
-  UserId: string;
-  UserName: string;
-};
-
-type Capabilities = {
-  PlayableMediaTypes: any[];
-  SupportedCommands: any[];
-  SupportsContentUploading: boolean;
-  SupportsMediaControl: boolean;
-  SupportsPersistentIdentifier: boolean;
-  SupportsSync: boolean;
-};
-
-type PlayState = {
-  CanSeek: boolean;
-  IsMuted: boolean;
-  IsPaused: boolean;
-  RepeatMode: string;
-};
-
-type User = {
-  Configuration: Configuration;
-  EnableAutoLogin: boolean;
-  HasConfiguredEasyPassword: boolean;
-  HasConfiguredPassword: boolean;
-  HasPassword: boolean;
-  Id: string;
-  LastActivityDate: string;
-  LastLoginDate: string;
-  Name: string;
-  Policy: Policy;
-  ServerId: string;
-};
-
-type Configuration = {
-  DisplayCollectionsView: boolean;
-  DisplayMissingEpisodes: boolean;
-  EnableLocalPassword: boolean;
-  EnableNextEpisodeAutoPlay: boolean;
-  GroupedFolders: any[];
-  HidePlayedInLatest: boolean;
-  LatestItemsExcludes: any[];
-  MyMediaExcludes: any[];
-  OrderedViews: any[];
-  PlayDefaultAudioTrack: boolean;
-  RememberAudioSelections: boolean;
-  RememberSubtitleSelections: boolean;
-  SubtitleLanguagePreference: string;
-  SubtitleMode: string;
-};
-
-type Policy = {
-  AccessSchedules: any[];
-  AuthenticationProviderId: string;
-  BlockUnratedItems: any[];
-  BlockedChannels: any[];
-  BlockedMediaFolders: any[];
-  BlockedTags: any[];
-  EnableAllChannels: boolean;
-  EnableAllDevices: boolean;
-  EnableAllFolders: boolean;
-  EnableAudioPlaybackTranscoding: boolean;
-  EnableContentDeletion: boolean;
-  EnableContentDeletionFromFolders: any[];
-  EnableContentDownloading: boolean;
-  EnableLiveTvAccess: boolean;
-  EnableLiveTvManagement: boolean;
-  EnableMediaConversion: boolean;
-  EnableMediaPlayback: boolean;
-  EnablePlaybackRemuxing: boolean;
-  EnablePublicSharing: boolean;
-  EnableRemoteAccess: boolean;
-  EnableRemoteControlOfOtherUsers: boolean;
-  EnableSharedDeviceControl: boolean;
-  EnableSyncTranscoding: boolean;
-  EnableUserPreferenceAccess: boolean;
-  EnableVideoPlaybackTranscoding: boolean;
-  EnabledChannels: any[];
-  EnabledDevices: any[];
-  EnabledFolders: any[];
-  ForceRemoteSourceTranscoding: boolean;
-  InvalidLoginAttemptCount: number;
-  IsAdministrator: boolean;
-  IsDisabled: boolean;
-  IsHidden: boolean;
-  LoginAttemptsBeforeLockout: number;
-  MaxActiveSessions: number;
-  PasswordResetProviderId: string;
-  RemoteClientBitrateLimit: number;
-  SyncPlayAccess: string;
-};
-
-type JFBaseParams = {
-  enableImageTypes?: JFImageType[];
-  fields?: string;
-  imageTypeLimit?: number;
-  parentId?: string;
-  recursive?: boolean;
-};
-
-type JFPaginationParams = {
-  limit?: number;
-  nameStartsWith?: string;
-  sortOrder?: JFSortOrder;
-  startIndex?: number;
-};
-
-export enum JFSortOrder {
-  ASC = 'Ascending',
-  DESC = 'Descending',
-}
-
-export enum JFAlbumListSort {
-  ALBUM_ARTIST = 'AlbumArtist,SortName',
-  COMMUNITY_RATING = 'CommunityRating,SortName',
-  CRITIC_RATING = 'CriticRating,SortName',
-  NAME = 'SortName',
-  RANDOM = 'Random,SortName',
-  RECENTLY_ADDED = 'DateCreated,SortName',
-  RELEASE_DATE = 'ProductionYear,PremiereDate,SortName',
-}
-
-export type JFAlbumListParams = {
-  albumArtistIds?: string;
-  artistIds?: string;
-  filters?: string;
-  genreIds?: string;
-  genres?: string;
-  includeItemTypes: 'MusicAlbum';
-  isFavorite?: boolean;
-  searchTerm?: string;
-  sortBy?: JFAlbumListSort;
-  tags?: string;
-  years?: string;
-} & JFBaseParams &
-  JFPaginationParams;
-
-export enum JFSongListSort {
-  ALBUM = 'Album,SortName',
-  ALBUM_ARTIST = 'AlbumArtist,Album,SortName',
-  ARTIST = 'Artist,Album,SortName',
-  DURATION = 'Runtime,AlbumArtist,Album,SortName',
-  NAME = 'Name,SortName',
-  PLAY_COUNT = 'PlayCount,SortName',
-  RANDOM = 'Random,SortName',
-  RECENTLY_ADDED = 'DateCreated,SortName',
-  RECENTLY_PLAYED = 'DatePlayed,SortName',
-  RELEASE_DATE = 'PremiereDate,AlbumArtist,Album,SortName',
-}
-
-export type JFSongListParams = {
-  albumArtistIds?: string;
-  albumIds?: string;
-  artistIds?: string;
-  contributingArtistIds?: string;
-  filters?: string;
-  genreIds?: string;
-  genres?: string;
-  ids?: string;
-  includeItemTypes: 'Audio';
-  searchTerm?: string;
-  sortBy?: JFSongListSort;
-  years?: string;
-} & JFBaseParams &
-  JFPaginationParams;
-
-export enum JFAlbumArtistListSort {
-  ALBUM = 'Album,SortName',
-  DURATION = 'Runtime,AlbumArtist,Album,SortName',
-  NAME = 'Name,SortName',
-  RANDOM = 'Random,SortName',
-  RECENTLY_ADDED = 'DateCreated,SortName',
-  RELEASE_DATE = 'PremiereDate,AlbumArtist,Album,SortName',
-}
-
-export type JFAlbumArtistListParams = {
-  filters?: string;
-  genres?: string;
-  sortBy?: JFAlbumArtistListSort;
-  years?: string;
-} & JFBaseParams &
-  JFPaginationParams;
-
-export enum JFArtistListSort {
-  ALBUM = 'Album,SortName',
-  DURATION = 'Runtime,AlbumArtist,Album,SortName',
-  NAME = 'Name,SortName',
-  RANDOM = 'Random,SortName',
-  RECENTLY_ADDED = 'DateCreated,SortName',
-  RELEASE_DATE = 'PremiereDate,AlbumArtist,Album,SortName',
-}
-
-export type JFArtistListParams = {
-  filters?: string;
-  genres?: string;
-  sortBy?: JFArtistListSort;
-  years?: string;
-} & JFBaseParams &
-  JFPaginationParams;
-
-export type JFCreatePlaylistResponse = {
-  Id: string;
-};
-
-export type JFCreatePlaylist = JFCreatePlaylistResponse;

src/renderer/api/navidrome.api.ts

@@ -1,509 +0,0 @@
-import { nanoid } from 'nanoid/non-secure';
-import ky from 'ky';
-import type {
-  NDGenreListResponse,
-  NDArtistListResponse,
-  NDAlbumDetail,
-  NDAlbumListParams,
-  NDAlbumList,
-  NDSongDetailResponse,
-  NDAlbum,
-  NDSong,
-  NDAuthenticationResponse,
-  NDAlbumDetailResponse,
-  NDSongDetail,
-  NDGenreList,
-  NDAlbumArtistListParams,
-  NDAlbumArtistDetail,
-  NDAlbumListResponse,
-  NDAlbumArtistDetailResponse,
-  NDAlbumArtistList,
-  NDSongListParams,
-  NDCreatePlaylistParams,
-  NDCreatePlaylistResponse,
-  NDDeletePlaylist,
-  NDDeletePlaylistResponse,
-  NDPlaylistListParams,
-  NDPlaylistDetail,
-  NDPlaylistList,
-  NDPlaylistListResponse,
-  NDPlaylistDetailResponse,
-  NDSongList,
-  NDSongListResponse,
-} from '/@/renderer/api/navidrome.types';
-import { NDPlaylistListSort, NDSongListSort, NDSortOrder } from '/@/renderer/api/navidrome.types';
-import type {
-  Album,
-  Song,
-  AuthenticationResponse,
-  AlbumDetailArgs,
-  GenreListArgs,
-  AlbumListArgs,
-  AlbumArtistListArgs,
-  AlbumArtistDetailArgs,
-  SongListArgs,
-  SongDetailArgs,
-  CreatePlaylistArgs,
-  DeletePlaylistArgs,
-  PlaylistListArgs,
-  PlaylistDetailArgs,
-  CreatePlaylistResponse,
-  PlaylistSongListArgs,
-} from '/@/renderer/api/types';
-import {
-  playlistListSortMap,
-  albumArtistListSortMap,
-  songListSortMap,
-  albumListSortMap,
-  sortOrderMap,
-} from '/@/renderer/api/types';
-import { toast } from '/@/renderer/components/toast';
-import { useAuthStore } from '/@/renderer/store';
-import { ServerListItem, ServerType } from '/@/renderer/types';
-import { parseSearchParams } from '/@/renderer/utils';
-
-const api = ky.create({
-  hooks: {
-    afterResponse: [
-      async (_request, _options, response) => {
-        const serverId = useAuthStore.getState().currentServer?.id;
-
-        if (serverId) {
-          useAuthStore.getState().actions.updateServer(serverId, {
-            ndCredential: response.headers.get('x-nd-authorization') as string,
-          });
-        }
-
-        return response;
-      },
-    ],
-    beforeError: [
-      (error) => {
-        if (error.response && error.response.status === 401) {
-          toast.error({
-            message: 'Your session has expired.',
-          });
-
-          const serverId = useAuthStore.getState().currentServer?.id;
-
-          if (serverId) {
-            useAuthStore.getState().actions.setCurrentServer(null);
-            useAuthStore.getState().actions.updateServer(serverId, { ndCredential: undefined });
-          }
-        }
-
-        return error;
-      },
-    ],
-  },
-});
-
-const authenticate = async (
-  url: string,
-  body: { password: string; username: string },
-): Promise<AuthenticationResponse> => {
-  const cleanServerUrl = url.replace(/\/$/, '');
-
-  const data = await ky
-    .post(`${cleanServerUrl}/auth/login`, {
-      json: {
-        password: body.password,
-        username: body.username,
-      },
-    })
-    .json<NDAuthenticationResponse>();
-
-  return {
-    credential: `u=${body.username}&s=${data.subsonicSalt}&t=${data.subsonicToken}`,
-    ndCredential: data.token,
-    userId: data.id,
-    username: data.username,
-  };
-};
-
-const getGenreList = async (args: GenreListArgs): Promise<NDGenreList> => {
-  const { server, signal } = args;
-
-  const data = await api
-    .get('api/genre', {
-      headers: { 'x-nd-authorization': `Bearer ${server?.ndCredential}` },
-      prefixUrl: server?.url,
-      signal,
-    })
-    .json<NDGenreListResponse>();
-
-  return data;
-};
-
-const getAlbumArtistDetail = async (args: AlbumArtistDetailArgs): Promise<NDAlbumArtistDetail> => {
-  const { query, server, signal } = args;
-
-  const data = await api
-    .get(`api/artist/${query.id}`, {
-      headers: { 'x-nd-authorization': `Bearer ${server?.ndCredential}` },
-      prefixUrl: server?.url,
-      signal,
-    })
-    .json<NDAlbumArtistDetailResponse>();
-
-  return { ...data };
-};
-
-const getAlbumArtistList = async (args: AlbumArtistListArgs): Promise<NDAlbumArtistList> => {
-  const { query, server, signal } = args;
-
-  const searchParams: NDAlbumArtistListParams = {
-    _end: query.startIndex + (query.limit || 0),
-    _order: sortOrderMap.navidrome[query.sortOrder],
-    _sort: albumArtistListSortMap.navidrome[query.sortBy],
-    _start: query.startIndex,
-    ...query.ndParams,
-  };
-
-  const data = await api
-    .get('api/artist', {
-      headers: { 'x-nd-authorization': `Bearer ${server?.ndCredential}` },
-      searchParams,
-      signal,
-    })
-    .json<NDArtistListResponse>();
-
-  return data;
-};
-
-const getAlbumDetail = async (args: AlbumDetailArgs): Promise<NDAlbumDetail> => {
-  const { query, server, signal } = args;
-
-  const data = await api
-    .get(`api/album/${query.id}`, {
-      headers: { 'x-nd-authorization': `Bearer ${server?.ndCredential}` },
-      prefixUrl: server?.url,
-      signal,
-    })
-    .json<NDAlbumDetailResponse>();
-
-  const songsData = await api
-    .get('api/song', {
-      headers: { 'x-nd-authorization': `Bearer ${server?.ndCredential}` },
-      prefixUrl: server?.url,
-      searchParams: {
-        _end: 0,
-        _order: NDSortOrder.ASC,
-        _sort: 'album',
-        _start: 0,
-        album_id: query.id,
-      },
-      signal,
-    })
-    .json<NDSongListResponse>();
-
-  return { ...data, songs: songsData };
-};
-
-const getAlbumList = async (args: AlbumListArgs): Promise<NDAlbumList> => {
-  const { query, server, signal } = args;
-
-  const searchParams: NDAlbumListParams = {
-    _end: query.startIndex + (query.limit || 0),
-    _order: sortOrderMap.navidrome[query.sortOrder],
-    _sort: albumListSortMap.navidrome[query.sortBy],
-    _start: query.startIndex,
-    name: query.searchTerm,
-    ...query.ndParams,
-  };
-
-  const res = await api.get('api/album', {
-    headers: { 'x-nd-authorization': `Bearer ${server?.ndCredential}` },
-    prefixUrl: server?.url,
-    searchParams: parseSearchParams(searchParams),
-    signal,
-  });
-
-  const data = await res.json<NDAlbumListResponse>();
-  const itemCount = res.headers.get('x-total-count');
-
-  return {
-    items: data,
-    startIndex: query?.startIndex || 0,
-    totalRecordCount: Number(itemCount),
-  };
-};
-
-const getSongList = async (args: SongListArgs): Promise<NDSongList> => {
-  const { query, server, signal } = args;
-
-  const searchParams: NDSongListParams = {
-    _end: query.startIndex + (query.limit || 0),
-    _order: sortOrderMap.navidrome[query.sortOrder],
-    _sort: songListSortMap.navidrome[query.sortBy],
-    _start: query.startIndex,
-    album_id: query.albumIds,
-    title: query.searchTerm,
-    ...query.ndParams,
-  };
-
-  const res = await api.get('api/song', {
-    headers: { 'x-nd-authorization': `Bearer ${server?.ndCredential}` },
-    prefixUrl: server?.url,
-    searchParams: parseSearchParams(searchParams),
-    signal,
-  });
-
-  const data = await res.json<NDSongListResponse>();
-  const itemCount = res.headers.get('x-total-count');
-
-  return {
-    items: data,
-    startIndex: query?.startIndex || 0,
-    totalRecordCount: Number(itemCount),
-  };
-};
-
-const getSongDetail = async (args: SongDetailArgs): Promise<NDSongDetail> => {
-  const { query, server, signal } = args;
-
-  const data = await api
-    .get(`api/song/${query.id}`, {
-      headers: { 'x-nd-authorization': `Bearer ${server?.ndCredential}` },
-      prefixUrl: server?.url,
-      signal,
-    })
-    .json<NDSongDetailResponse>();
-
-  return data;
-};
-
-const createPlaylist = async (args: CreatePlaylistArgs): Promise<CreatePlaylistResponse> => {
-  const { query, server, signal } = args;
-
-  const json: NDCreatePlaylistParams = {
-    comment: query.comment,
-    name: query.name,
-    public: query.public || false,
-  };
-
-  const data = await api
-    .post('api/playlist', {
-      headers: { 'x-nd-authorization': `Bearer ${server?.ndCredential}` },
-      json,
-      prefixUrl: server?.url,
-      signal,
-    })
-    .json<NDCreatePlaylistResponse>();
-
-  return {
-    id: data.id,
-    name: query.name,
-  };
-};
-
-const deletePlaylist = async (args: DeletePlaylistArgs): Promise<NDDeletePlaylist> => {
-  const { query, server, signal } = args;
-
-  const data = await api
-    .delete(`api/playlist/${query.id}`, {
-      headers: { 'x-nd-authorization': `Bearer ${server?.ndCredential}` },
-      prefixUrl: server?.url,
-      signal,
-    })
-    .json<NDDeletePlaylistResponse>();
-
-  return data;
-};
-
-const getPlaylistList = async (args: PlaylistListArgs): Promise<NDPlaylistList> => {
-  const { query, server, signal } = args;
-
-  const searchParams: NDPlaylistListParams = {
-    _end: query.startIndex + (query.limit || 0),
-    _order: query.sortOrder ? sortOrderMap.navidrome[query.sortOrder] : NDSortOrder.ASC,
-    _sort: query.sortBy ? playlistListSortMap.navidrome[query.sortBy] : NDPlaylistListSort.NAME,
-    _start: query.startIndex,
-  };
-
-  const res = await api.get('api/playlist', {
-    headers: { 'x-nd-authorization': `Bearer ${server?.ndCredential}` },
-    prefixUrl: server?.url,
-    searchParams,
-    signal,
-  });
-
-  const data = await res.json<NDPlaylistListResponse>();
-  const itemCount = res.headers.get('x-total-count');
-
-  return {
-    items: data,
-    startIndex: query?.startIndex || 0,
-    totalRecordCount: Number(itemCount),
-  };
-};
-
-const getPlaylistDetail = async (args: PlaylistDetailArgs): Promise<NDPlaylistDetail> => {
-  const { query, server, signal } = args;
-
-  const data = await api
-    .get(`api/playlist/${query.id}`, {
-      headers: { 'x-nd-authorization': `Bearer ${server?.ndCredential}` },
-      prefixUrl: server?.url,
-      signal,
-    })
-    .json<NDPlaylistDetailResponse>();
-
-  return data;
-};
-
-const getPlaylistSongList = async (args: PlaylistSongListArgs): Promise<NDSongList> => {
-  const { query, server, signal } = args;
-
-  const searchParams: NDSongListParams & { playlist_id: string } = {
-    _end: query.startIndex + (query.limit || 0),
-    _order: query.sortOrder ? sortOrderMap.navidrome[query.sortOrder] : NDSortOrder.ASC,
-    _sort: query.sortBy ? songListSortMap.navidrome[query.sortBy] : NDSongListSort.ID,
-    _start: query.startIndex,
-    playlist_id: query.id,
-  };
-
-  const data = await api
-    .get(`api/playlist/${query.id}/tracks`, {
-      headers: { 'x-nd-authorization': `Bearer ${server?.ndCredential}` },
-      prefixUrl: server?.url,
-      searchParams: parseSearchParams(searchParams),
-      signal,
-    })
-    .json<NDSongListResponse>();
-
-  return {
-    items: data,
-    startIndex: query?.startIndex || 0,
-    totalRecordCount: data.length,
-  };
-};
-
-const getCoverArtUrl = (args: {
-  baseUrl: string;
-  coverArtId: string;
-  credential: string;
-  size: number;
-}) => {
-  const size = args.size ? args.size : 250;
-
-  if (!args.coverArtId || args.coverArtId.match('2a96cbd8b46e442fc41c2b86b821562f')) {
-    return null;
-  }
-
-  return (
-    `${args.baseUrl}/rest/getCoverArt.view` +
-    `?id=${args.coverArtId}` +
-    `&${args.credential}` +
-    '&v=1.13.0' +
-    '&c=feishin' +
-    `&size=${size}`
-  );
-};
-
-const normalizeSong = (
-  item: NDSong,
-  server: ServerListItem,
-  deviceId: string,
-  imageSize?: number,
-): Song => {
-  const imageUrl = getCoverArtUrl({
-    baseUrl: server.url,
-    coverArtId: item.albumId,
-    credential: server.credential,
-    size: imageSize || 300,
-  });
-
-  return {
-    album: item.album,
-    albumArtists: [{ id: item.artistId, name: item.artist }],
-    albumId: item.albumId,
-    artistName: item.artist,
-    artists: [{ id: item.artistId, name: item.artist }],
-    bitRate: item.bitRate,
-    bpm: item.bpm ? item.bpm : null,
-    channels: item.channels ? item.channels : null,
-    compilation: item.compilation,
-    container: item.suffix,
-    createdAt: item.createdAt.split('T')[0],
-    discNumber: item.discNumber,
-    duration: item.duration,
-    genres: item.genres,
-    id: item.id,
-    imageUrl,
-    isFavorite: item.starred,
-    lastPlayedAt: item.playDate ? item.playDate : null,
-    name: item.title,
-    note: item.comment ? item.comment : null,
-    path: item.path,
-    playCount: item.playCount,
-    releaseDate: new Date(item.year, 0, 1).toISOString(),
-    releaseYear: String(item.year),
-    serverId: server.id,
-    size: item.size,
-    streamUrl: `${server.url}/rest/stream.view?id=${item.id}&v=1.13.0&c=feishin_${deviceId}&${server.credential}`,
-    trackNumber: item.trackNumber,
-    type: ServerType.NAVIDROME,
-    uniqueId: nanoid(),
-    updatedAt: item.updatedAt,
-  };
-};
-
-const normalizeAlbum = (item: NDAlbum, server: ServerListItem, imageSize?: number): Album => {
-  const imageUrl = getCoverArtUrl({
-    baseUrl: server.url,
-    coverArtId: item.coverArtId,
-    credential: server.credential,
-    size: imageSize || 300,
-  });
-
-  const imagePlaceholderUrl = imageUrl?.replace(/size=\d+/, 'size=50') || null;
-  const imageBackdropUrl = imageUrl?.replace(/size=\d+/, 'size=1000') || null;
-
-  return {
-    albumArtists: [{ id: item.albumArtistId, name: item.albumArtist }],
-    artists: [{ id: item.artistId, name: item.artist }],
-    backdropImageUrl: imageBackdropUrl,
-    createdAt: item.createdAt.split('T')[0],
-    duration: item.duration || null,
-    genres: item.genres,
-    id: item.id,
-    imagePlaceholderUrl,
-    imageUrl,
-    isCompilation: item.compilation,
-    isFavorite: item.starred,
-    lastPlayedAt: item.playDate ? item.playDate.split('T')[0] : null,
-    name: item.name,
-    playCount: item.playCount,
-    rating: item.rating,
-    releaseDate: new Date(item.minYear, 0, 1).toISOString(),
-    releaseYear: item.minYear,
-    serverType: ServerType.NAVIDROME,
-    size: item.size,
-    songCount: item.songCount,
-    songs: item.songs ? item.songs.map((song) => normalizeSong(song, server, '')) : undefined,
-    uniqueId: nanoid(),
-    updatedAt: item.updatedAt,
-  };
-};
-
-export const navidromeApi = {
-  authenticate,
-  createPlaylist,
-  deletePlaylist,
-  getAlbumArtistDetail,
-  getAlbumArtistList,
-  getAlbumDetail,
-  getAlbumList,
-  getGenreList,
-  getPlaylistDetail,
-  getPlaylistList,
-  getPlaylistSongList,
-  getSongDetail,
-  getSongList,
-};
-
-export const ndNormalize = {
-  album: normalizeAlbum,
-  song: normalizeSong,
-};

src/renderer/api/navidrome.types.ts

@@ -1,317 +0,0 @@
-export type NDAuthenticate = {
-  id: string;
-  isAdmin: boolean;
-  name: string;
-  subsonicSalt: string;
-  subsonicToken: string;
-  token: string;
-  username: string;
-};
-
-export type NDGenre = {
-  id: string;
-  name: string;
-};
-
-export type NDAlbum = {
-  albumArtist: string;
-  albumArtistId: string;
-  allArtistIds: string;
-  artist: string;
-  artistId: string;
-  compilation: boolean;
-  coverArtId: string;
-  coverArtPath: string;
-  createdAt: string;
-  duration: number;
-  fullText: string;
-  genre: string;
-  genres: NDGenre[];
-  id: string;
-  maxYear: number;
-  mbzAlbumArtistId: string;
-  mbzAlbumId: string;
-  minYear: number;
-  name: string;
-  orderAlbumArtistName: string;
-  orderAlbumName: string;
-  playCount: number;
-  playDate: string;
-  rating: number;
-  size: number;
-  songCount: number;
-  sortAlbumArtistName: string;
-  sortArtistName: string;
-  starred: boolean;
-  starredAt: string;
-  updatedAt: string;
-} & { songs?: NDSong[] };
-
-export type NDSong = {
-  album: string;
-  albumArtist: string;
-  albumArtistId: string;
-  albumId: string;
-  artist: string;
-  artistId: string;
-  bitRate: number;
-  bookmarkPosition: number;
-  bpm?: number;
-  channels?: number;
-  comment?: string;
-  compilation: boolean;
-  createdAt: string;
-  discNumber: number;
-  duration: number;
-  fullText: string;
-  genre: string;
-  genres: NDGenre[];
-  hasCoverArt: boolean;
-  id: string;
-  lyrics?: string;
-  mbzAlbumArtistId: string;
-  mbzAlbumId: string;
-  mbzArtistId: string;
-  mbzTrackId: string;
-  orderAlbumArtistName: string;
-  orderAlbumName: string;
-  orderArtistName: string;
-  orderTitle: string;
-  path: string;
-  playCount: number;
-  playDate: string;
-  rating: number;
-  size: number;
-  sortAlbumArtistName: string;
-  sortArtistName: string;
-  starred: boolean;
-  starredAt: string;
-  suffix: string;
-  title: string;
-  trackNumber: number;
-  updatedAt: string;
-  year: number;
-};
-
-export type NDAlbumArtist = {
-  albumCount: number;
-  biography: string;
-  externalInfoUpdatedAt: string;
-  externalUrl: string;
-  fullText: string;
-  genres: NDGenre[];
-  id: string;
-  largeImageUrl: string;
-  mbzArtistId: string;
-  mediumImageUrl: string;
-  name: string;
-  orderArtistName: string;
-  playCount: number;
-  playDate: string;
-  rating: number;
-  size: number;
-  smallImageUrl: string;
-  songCount: number;
-  starred: boolean;
-  starredAt: string;
-};
-
-export type NDAuthenticationResponse = NDAuthenticate;
-
-export type NDAlbumArtistList = NDAlbumArtist[];
-
-export type NDAlbumArtistDetail = NDAlbumArtist;
-
-export type NDAlbumArtistDetailResponse = NDAlbumArtist;
-
-export type NDGenreList = NDGenre[];
-
-export type NDGenreListResponse = NDGenre[];
-
-export type NDAlbumDetailResponse = NDAlbum;
-
-export type NDAlbumDetail = NDAlbum & { songs?: NDSongListResponse };
-
-export type NDAlbumListResponse = NDAlbum[];
-
-export type NDAlbumList = {
-  items: NDAlbum[];
-  startIndex: number;
-  totalRecordCount: number;
-};
-
-export type NDSongDetail = NDSong;
-
-export type NDSongDetailResponse = NDSong;
-
-export type NDSongListResponse = NDSong[];
-
-export type NDSongList = {
-  items: NDSong[];
-  startIndex: number;
-  totalRecordCount: number;
-};
-
-export type NDArtistListResponse = NDAlbumArtist[];
-
-export type NDPagination = {
-  _end?: number;
-  _start?: number;
-};
-
-export enum NDSortOrder {
-  ASC = 'ASC',
-  DESC = 'DESC',
-}
-
-export type NDOrder = {
-  _order?: NDSortOrder;
-};
-
-export enum NDGenreListSort {
-  NAME = 'name',
-}
-
-export type NDGenreListParams = {
-  _sort?: NDGenreListSort;
-  id?: string;
-} & NDPagination &
-  NDOrder;
-
-export enum NDAlbumListSort {
-  ALBUM_ARTIST = 'albumArtist',
-  ARTIST = 'artist',
-  DURATION = 'duration',
-  NAME = 'name',
-  PLAY_COUNT = 'playCount',
-  PLAY_DATE = 'play_date',
-  RANDOM = 'random',
-  RATING = 'rating',
-  RECENTLY_ADDED = 'recently_added',
-  SONG_COUNT = 'songCount',
-  STARRED = 'starred',
-  YEAR = 'max_year',
-}
-
-export type NDAlbumListParams = {
-  _sort?: NDAlbumListSort;
-  album_id?: string;
-  artist_id?: string;
-  compilation?: boolean;
-  genre_id?: string;
-  has_rating?: boolean;
-  id?: string;
-  name?: string;
-  recently_played?: boolean;
-  starred?: boolean;
-  year?: number;
-} & NDPagination &
-  NDOrder;
-
-export enum NDSongListSort {
-  ALBUM = 'album, order_album_artist_name, disc_number, track_number, title',
-  ALBUM_ARTIST = 'albumArtist',
-  ARTIST = 'artist',
-  BPM = 'bpm',
-  CHANNELS = 'channels',
-  COMMENT = 'comment',
-  DURATION = 'duration',
-  FAVORITED = 'starred ASC, starredAt ASC',
-  GENRE = 'genre',
-  ID = 'id',
-  PLAY_COUNT = 'playCount',
-  PLAY_DATE = 'playDate',
-  RATING = 'rating',
-  TITLE = 'title',
-  TRACK = 'track',
-  YEAR = 'year',
-}
-
-export type NDSongListParams = {
-  _sort?: NDSongListSort;
-  album_id?: string[];
-  genre_id?: string;
-  starred?: boolean;
-} & NDPagination &
-  NDOrder;
-
-export enum NDAlbumArtistListSort {
-  ALBUM_COUNT = 'albumCount',
-  FAVORITED = 'starred ASC, starredAt ASC',
-  NAME = 'name',
-  PLAY_COUNT = 'playCount',
-  RATING = 'rating',
-  SONG_COUNT = 'songCount',
-}
-
-export type NDAlbumArtistListParams = {
-  _sort?: NDAlbumArtistListSort;
-  genre_id?: string;
-  starred?: boolean;
-} & NDPagination &
-  NDOrder;
-
-export type NDCreatePlaylistParams = {
-  comment?: string;
-  name: string;
-  public: boolean;
-};
-
-export type NDCreatePlaylistResponse = {
-  id: string;
-};
-
-export type NDCreatePlaylist = NDCreatePlaylistResponse;
-
-export type NDDeletePlaylistParams = {
-  id: string;
-};
-
-export type NDDeletePlaylistResponse = null;
-
-export type NDDeletePlaylist = NDDeletePlaylistResponse;
-
-export type NDPlaylist = {
-  comment: string;
-  createdAt: string;
-  duration: number;
-  evaluatedAt: string;
-  id: string;
-  name: string;
-  ownerId: string;
-  ownerName: string;
-  path: string;
-  public: boolean;
-  rules: null;
-  size: number;
-  songCount: number;
-  sync: boolean;
-  updatedAt: string;
-};
-
-export type NDPlaylistDetail = NDPlaylist;
-
-export type NDPlaylistDetailResponse = NDPlaylist;
-
-export type NDPlaylistList = {
-  items: NDPlaylist[];
-  startIndex: number;
-  totalRecordCount: number;
-};
-
-export type NDPlaylistListResponse = NDPlaylist[];
-
-export enum NDPlaylistListSort {
-  DURATION = 'duration',
-  NAME = 'name',
-  OWNER = 'owner',
-  PUBLIC = 'public',
-  SONG_COUNT = 'songCount',
-  UPDATED_AT = 'updatedAt',
-}
-
-export type NDPlaylistListParams = {
-  _sort?: NDPlaylistListSort;
-  owner_id?: string;
-} & NDPagination &
-  NDOrder;

src/renderer/api/normalize.ts

@@ -1,145 +0,0 @@
-import { jfNormalize } from '/@/renderer/api/jellyfin.api';
-import type {
-  JFAlbum,
-  JFGenreList,
-  JFMusicFolderList,
-  JFSong,
-} from '/@/renderer/api/jellyfin.types';
-import { ndNormalize } from '/@/renderer/api/navidrome.api';
-import type { NDAlbum, NDGenreList, NDSong } from '/@/renderer/api/navidrome.types';
-import { SSGenreList, SSMusicFolderList } from '/@/renderer/api/subsonic.types';
-import type {
-  Album,
-  RawAlbumDetailResponse,
-  RawAlbumListResponse,
-  RawGenreListResponse,
-  RawMusicFolderListResponse,
-  RawSongListResponse,
-} from '/@/renderer/api/types';
-import { ServerListItem } from '/@/renderer/types';
-
-const albumList = (data: RawAlbumListResponse | undefined, server: ServerListItem | null) => {
-  let albums;
-  switch (server?.type) {
-    case 'jellyfin':
-      albums = data?.items.map((item) => jfNormalize.album(item as JFAlbum, server));
-      break;
-    case 'navidrome':
-      albums = data?.items.map((item) => ndNormalize.album(item as NDAlbum, server));
-      break;
-    case 'subsonic':
-      break;
-  }
-
-  return {
-    items: albums,
-    startIndex: data?.startIndex,
-    totalRecordCount: data?.totalRecordCount,
-  };
-};
-
-const albumDetail = (
-  data: RawAlbumDetailResponse | undefined,
-  server: ServerListItem | null,
-): Album | undefined => {
-  let album: Album | undefined;
-  switch (server?.type) {
-    case 'jellyfin':
-      album = jfNormalize.album(data as JFAlbum, server);
-      break;
-    case 'navidrome':
-      album = ndNormalize.album(data as NDAlbum, server);
-      break;
-    case 'subsonic':
-      break;
-  }
-
-  return album;
-};
-
-const songList = (data: RawSongListResponse | undefined, server: ServerListItem | null) => {
-  let songs;
-  switch (server?.type) {
-    case 'jellyfin':
-      songs = data?.items.map((item) => jfNormalize.song(item as JFSong, server, ''));
-      break;
-    case 'navidrome':
-      songs = data?.items.map((item) => ndNormalize.song(item as NDSong, server, ''));
-      break;
-    case 'subsonic':
-      break;
-  }
-
-  return {
-    items: songs,
-    startIndex: data?.startIndex,
-    totalRecordCount: data?.totalRecordCount,
-  };
-};
-
-const musicFolderList = (
-  data: RawMusicFolderListResponse | undefined,
-  server: ServerListItem | null,
-) => {
-  let musicFolders;
-  switch (server?.type) {
-    case 'jellyfin':
-      musicFolders = (data as JFMusicFolderList)?.map((item) => ({
-        id: String(item.Id),
-        name: item.Name,
-      }));
-      break;
-    case 'navidrome':
-      musicFolders = (data as SSMusicFolderList)?.map((item) => ({
-        id: String(item.id),
-        name: item.name,
-      }));
-      break;
-    case 'subsonic':
-      musicFolders = (data as SSMusicFolderList)?.map((item) => ({
-        id: String(item.id),
-        name: item.name,
-      }));
-      break;
-  }
-
-  return musicFolders;
-};
-
-const genreList = (data: RawGenreListResponse | undefined, server: ServerListItem | null) => {
-  let genres;
-  switch (server?.type) {
-    case 'jellyfin':
-      genres = (data as JFGenreList)?.Items.map((item) => ({
-        id: String(item.Id),
-        name: item.Name,
-      })).sort((a, b) => a.name.localeCompare(b.name));
-      break;
-    case 'navidrome':
-      genres = (data as NDGenreList)
-        ?.map((item) => ({
-          id: String(item.id),
-          name: item.name,
-        }))
-        .sort((a, b) => a.name.localeCompare(b.name));
-      break;
-    case 'subsonic':
-      genres = (data as SSGenreList)
-        ?.map((item) => ({
-          id: item.value,
-          name: item.value,
-        }))
-        .sort((a, b) => a.name.localeCompare(b.name));
-      break;
-  }
-
-  return genres;
-};
-
-export const normalize = {
-  albumDetail,
-  albumList,
-  genreList,
-  musicFolderList,
-  songList,
-};

src/renderer/api/queries/useAlbum.ts

@@ -0,0 +1,10 @@
+import { useQuery } from 'react-query';
+import { albumsApi } from '../albumsApi';
+import { queryKeys } from '../queryKeys';
+
+export const useAlbum = (albumId: number) => {
+  return useQuery({
+    queryFn: () => albumsApi.getAlbum(albumId),
+    queryKey: queryKeys.album(albumId),
+  });
+};

src/renderer/api/query-keys.ts

@@ -1,26 +0,0 @@
-import type { AlbumListQuery, SongListQuery, AlbumDetailQuery } from './types';
-
-export const queryKeys = {
-  albums: {
-    detail: (serverId: string, query: AlbumDetailQuery) =>
-      [serverId, 'albums', 'detail', query] as const,
-    list: (serverId: string, query: AlbumListQuery) => [serverId, 'albums', 'list', query] as const,
-    root: ['albums'],
-    serverRoot: (serverId: string) => [serverId, 'albums'],
-    songs: (serverId: string, query: SongListQuery) =>
-      [serverId, 'albums', 'songs', query] as const,
-  },
-  genres: {
-    list: (serverId: string) => [serverId, 'genres', 'list'] as const,
-    root: (serverId: string) => [serverId, 'genres'] as const,
-  },
-  musicFolders: {
-    list: (serverId: string) => [serverId, 'musicFolders', 'list'] as const,
-  },
-  server: {
-    root: (serverId: string) => [serverId] as const,
-  },
-  songs: {
-    list: (serverId: string, query: SongListQuery) => [serverId, 'songs', 'list', query] as const,
-  },
-};

src/renderer/api/queryKeys.ts

@@ -0,0 +1,8 @@
+import { AlbumsRequest } from './albumsApi';
+
+export const queryKeys = {
+  album: (albumId: number) => ['album', albumId] as const,
+  albums: (params: AlbumsRequest) => ['albums', params] as const,
+  ping: (url: string) => ['ping', url] as const,
+  servers: ['servers'] as const,
+};

src/renderer/api/serversApi.ts

@@ -0,0 +1,22 @@
+import { api } from 'renderer/lib';
+
+const getServers = async () => {
+  const { data } = await api.get<any[]>('/servers');
+  return data;
+};
+
+const createServer = async (body: {
+  name: string;
+  remoteUserId: string;
+  token: string;
+  url: string;
+  username: string;
+}) => {
+  const { data } = await api.post<any>('/servers', body);
+  return data;
+};
+
+export const serversApi = {
+  createServer,
+  getServers,
+};

src/renderer/api/subsonic.api.ts

@@ -1,305 +0,0 @@
-import ky from 'ky';
-import md5 from 'md5';
-import { randomString } from '/@/renderer/utils';
-import type {
-  SSAlbumListResponse,
-  SSAlbumDetailResponse,
-  SSArtistIndex,
-  SSAlbumArtistList,
-  SSAlbumArtistListResponse,
-  SSGenreListResponse,
-  SSMusicFolderList,
-  SSMusicFolderListResponse,
-  SSGenreList,
-  SSAlbumDetail,
-  SSAlbumList,
-  SSAlbumArtistDetail,
-  SSAlbumArtistDetailResponse,
-  SSFavoriteParams,
-  SSFavoriteResponse,
-  SSRatingParams,
-  SSRatingResponse,
-  SSAlbumArtistDetailParams,
-  SSAlbumArtistListParams,
-} from '/@/renderer/api/subsonic.types';
-import type {
-  AlbumArtistDetailArgs,
-  AlbumArtistListArgs,
-  AlbumDetailArgs,
-  AlbumListArgs,
-  AuthenticationResponse,
-  FavoriteArgs,
-  FavoriteResponse,
-  GenreListArgs,
-  MusicFolderListArgs,
-  RatingArgs,
-} from '/@/renderer/api/types';
-import { useAuthStore } from '/@/renderer/store';
-import { toast } from '/@/renderer/components/toast';
-
-const getCoverArtUrl = (args: {
-  baseUrl: string;
-  coverArtId: string;
-  credential: string;
-  size: number;
-}) => {
-  const size = args.size ? args.size : 150;
-
-  if (!args.coverArtId || args.coverArtId.match('2a96cbd8b46e442fc41c2b86b821562f')) {
-    return null;
-  }
-
-  return (
-    `${args.baseUrl}/getCoverArt.view` +
-    `?id=${args.coverArtId}` +
-    `&${args.credential}` +
-    '&v=1.13.0' +
-    '&c=feishin' +
-    `&size=${size}`
-  );
-};
-
-const api = ky.create({
-  hooks: {
-    afterResponse: [
-      async (_request, _options, response) => {
-        const data = await response.json();
-        if (data['subsonic-response'].status !== 'ok') {
-          toast.warn({ message: 'Issue from Subsonic API' });
-        }
-
-        return new Response(JSON.stringify(data['subsonic-response']), { status: 200 });
-      },
-    ],
-    beforeRequest: [
-      (request) => {
-        const server = useAuthStore.getState().currentServer;
-
-        const searchParams = new URLSearchParams();
-
-        if (server) {
-          const authParams = server.credential.split(/&?\w=/gm);
-
-          searchParams.set('u', server.username);
-          searchParams.set('v', '1.13.0');
-          searchParams.set('c', 'Feishin');
-          searchParams.set('f', 'json');
-
-          if (authParams?.length === 4) {
-            searchParams.set('s', authParams[2]);
-            searchParams.set('t', authParams[3]);
-          } else if (authParams?.length === 3) {
-            searchParams.set('p', authParams[2]);
-          }
-        }
-
-        return ky(request, { searchParams });
-      },
-    ],
-  },
-});
-
-const authenticate = async (
-  url: string,
-  body: {
-    legacy?: boolean;
-    password: string;
-    username: string;
-  },
-): Promise<AuthenticationResponse> => {
-  let credential;
-  const cleanServerUrl = url.replace(/\/$/, '');
-
-  if (body.legacy) {
-    credential = `u=${body.username}&p=${body.password}`;
-  } else {
-    const salt = randomString(12);
-    const hash = md5(body.password + salt);
-    credential = `u=${body.username}&s=${salt}&t=${hash}`;
-  }
-
-  await ky.get(`${cleanServerUrl}/rest/ping.view?v=1.13.0&c=Feishin&f=json&${credential}`);
-
-  return {
-    credential,
-    userId: null,
-    username: body.username,
-  };
-};
-
-const getMusicFolderList = async (args: MusicFolderListArgs): Promise<SSMusicFolderList> => {
-  const { signal, server } = args;
-
-  const data = await api
-    .get('rest/getMusicFolders.view', {
-      prefixUrl: server?.url,
-      signal,
-    })
-    .json<SSMusicFolderListResponse>();
-
-  return data.musicFolders.musicFolder;
-};
-
-export const getAlbumArtistDetail = async (
-  args: AlbumArtistDetailArgs,
-): Promise<SSAlbumArtistDetail> => {
-  const { server, signal, query } = args;
-
-  const searchParams: SSAlbumArtistDetailParams = {
-    id: query.id,
-  };
-
-  const data = await api
-    .get('/getArtist.view', {
-      prefixUrl: server?.url,
-      searchParams,
-      signal,
-    })
-    .json<SSAlbumArtistDetailResponse>();
-
-  return data.artist;
-};
-
-const getAlbumArtistList = async (args: AlbumArtistListArgs): Promise<SSAlbumArtistList> => {
-  const { signal, server, query } = args;
-
-  const searchParams: SSAlbumArtistListParams = {
-    musicFolderId: query.musicFolderId,
-  };
-
-  const data = await api
-    .get('rest/getArtists.view', {
-      prefixUrl: server?.url,
-      searchParams,
-      signal,
-    })
-    .json<SSAlbumArtistListResponse>();
-
-  const artists = (data.artists?.index || []).flatMap((index: SSArtistIndex) => index.artist);
-
-  return artists;
-};
-
-const getGenreList = async (args: GenreListArgs): Promise<SSGenreList> => {
-  const { server, signal } = args;
-
-  const data = await api
-    .get('rest/getGenres.view', {
-      prefixUrl: server?.url,
-      signal,
-    })
-    .json<SSGenreListResponse>();
-
-  return data.genres.genre;
-};
-
-const getAlbumDetail = async (args: AlbumDetailArgs): Promise<SSAlbumDetail> => {
-  const { server, query, signal } = args;
-
-  const data = await api
-    .get('rest/getAlbum.view', {
-      prefixUrl: server?.url,
-      searchParams: { id: query.id },
-      signal,
-    })
-    .json<SSAlbumDetailResponse>();
-
-  const { song: songs, ...dataWithoutSong } = data.album;
-  return { ...dataWithoutSong, songs };
-};
-
-const getAlbumList = async (args: AlbumListArgs): Promise<SSAlbumList> => {
-  const { server, query, signal } = args;
-
-  const normalizedParams = {};
-  const data = await api
-    .get('rest/getAlbumList2.view', {
-      prefixUrl: server?.url,
-      searchParams: normalizedParams,
-      signal,
-    })
-    .json<SSAlbumListResponse>();
-
-  return {
-    items: data.albumList2.album,
-    startIndex: query.startIndex,
-    totalRecordCount: null,
-  };
-};
-
-const createFavorite = async (args: FavoriteArgs): Promise<FavoriteResponse> => {
-  const { server, query, signal } = args;
-
-  const searchParams: SSFavoriteParams = {
-    albumId: query.type === 'album' ? query.id : undefined,
-    artistId: query.type === 'albumArtist' ? query.id : undefined,
-    id: query.type === 'song' ? query.id : undefined,
-  };
-
-  await api
-    .get('rest/star.view', {
-      prefixUrl: server?.url,
-      searchParams,
-      signal,
-    })
-    .json<SSFavoriteResponse>();
-
-  return {
-    id: query.id,
-  };
-};
-
-const deleteFavorite = async (args: FavoriteArgs): Promise<FavoriteResponse> => {
-  const { server, query, signal } = args;
-
-  const searchParams: SSFavoriteParams = {
-    albumId: query.type === 'album' ? query.id : undefined,
-    artistId: query.type === 'albumArtist' ? query.id : undefined,
-    id: query.type === 'song' ? query.id : undefined,
-  };
-
-  await api
-    .get('rest/unstar.view', {
-      prefixUrl: server?.url,
-      searchParams,
-      signal,
-    })
-    .json<SSFavoriteResponse>();
-
-  return {
-    id: query.id,
-  };
-};
-
-const updateRating = async (args: RatingArgs) => {
-  const { server, query, signal } = args;
-
-  const searchParams: SSRatingParams = {
-    id: query.id,
-    rating: query.rating,
-  };
-
-  const data = await api
-    .get('rest/setRating.view', {
-      prefixUrl: server?.url,
-      searchParams,
-      signal,
-    })
-    .json<SSRatingResponse>();
-
-  return data;
-};
-
-export const subsonicApi = {
-  authenticate,
-  createFavorite,
-  deleteFavorite,
-  getAlbumArtistDetail,
-  getAlbumArtistList,
-  getAlbumDetail,
-  getAlbumList,
-  getCoverArtUrl,
-  getGenreList,
-  getMusicFolderList,
-  updateRating,
-};

src/renderer/api/subsonic.types.ts

@@ -1,184 +0,0 @@
-export type SSBaseResponse = {
-  serverVersion?: 'string';
-  status: 'string';
-  type?: 'string';
-  version: 'string';
-};
-
-export type SSMusicFolderList = SSMusicFolder[];
-
-export type SSMusicFolderListResponse = {
-  musicFolders: {
-    musicFolder: SSMusicFolder[];
-  };
-};
-
-export type SSGenreList = SSGenre[];
-
-export type SSGenreListResponse = {
-  genres: {
-    genre: SSGenre[];
-  };
-};
-
-export type SSAlbumArtistDetailParams = {
-  id: string;
-};
-
-export type SSAlbumArtistDetail = SSAlbumArtistListEntry & { album: SSAlbumListEntry[] };
-
-export type SSAlbumArtistDetailResponse = {
-  artist: SSAlbumArtistListEntry & {
-    album: SSAlbumListEntry[];
-  };
-};
-
-export type SSAlbumArtistList = SSAlbumArtistListEntry[];
-
-export type SSAlbumArtistListResponse = {
-  artists: {
-    ignoredArticles: string;
-    index: SSArtistIndex[];
-    lastModified: number;
-  };
-};
-
-export type SSAlbumList = {
-  items: SSAlbumListEntry[];
-  startIndex: number;
-  totalRecordCount: number | null;
-};
-
-export type SSAlbumListResponse = {
-  albumList2: {
-    album: SSAlbumListEntry[];
-  };
-};
-
-export type SSAlbumDetail = Omit<SSAlbum, 'song'> & { songs: SSSong[] };
-
-export type SSAlbumDetailResponse = {
-  album: SSAlbum;
-};
-
-export type SSArtistInfoResponse = {
-  artistInfo2: SSArtistInfo;
-};
-
-export type SSArtistInfo = {
-  biography: string;
-  largeImageUrl?: string;
-  lastFmUrl?: string;
-  mediumImageUrl?: string;
-  musicBrainzId?: string;
-  smallImageUrl?: string;
-};
-
-export type SSMusicFolder = {
-  id: number;
-  name: string;
-};
-
-export type SSGenre = {
-  albumCount?: number;
-  songCount?: number;
-  value: string;
-};
-
-export type SSArtistIndex = {
-  artist: SSAlbumArtistListEntry[];
-  name: string;
-};
-
-export type SSAlbumArtistListEntry = {
-  albumCount: string;
-  artistImageUrl?: string;
-  coverArt?: string;
-  id: string;
-  name: string;
-};
-
-export type SSAlbumListEntry = {
-  album: string;
-  artist: string;
-  artistId: string;
-  coverArt: string;
-  created: string;
-  duration: number;
-  genre?: string;
-  id: string;
-  isDir: boolean;
-  isVideo: boolean;
-  name: string;
-  parent: string;
-  songCount: number;
-  starred?: boolean;
-  title: string;
-  userRating?: number;
-  year: number;
-};
-
-export type SSAlbum = {
-  song: SSSong[];
-} & SSAlbumListEntry;
-
-export type SSSong = {
-  album: string;
-  albumId: string;
-  artist: string;
-  artistId?: string;
-  bitRate: number;
-  contentType: string;
-  coverArt: string;
-  created: string;
-  discNumber?: number;
-  duration: number;
-  genre: string;
-  id: string;
-  isDir: boolean;
-  isVideo: boolean;
-  parent: string;
-  path: string;
-  playCount: number;
-  size: number;
-  starred?: boolean;
-  suffix: string;
-  title: string;
-  track: number;
-  type: string;
-  userRating?: number;
-  year: number;
-};
-
-export type SSAlbumListParams = {
-  fromYear?: number;
-  genre?: string;
-  musicFolderId?: string;
-  offset?: number;
-  size?: number;
-  toYear?: number;
-  type: string;
-};
-
-export type SSAlbumArtistListParams = {
-  musicFolderId?: string;
-};
-
-export type SSFavoriteParams = {
-  albumId?: string;
-  artistId?: string;
-  id?: string;
-};
-
-export type SSFavorite = null;
-
-export type SSFavoriteResponse = null;
-
-export type SSRatingParams = {
-  id: string;
-  rating: number;
-};
-
-export type SSRating = null;
-
-export type SSRatingResponse = null;

src/renderer/api/types.ts

@@ -1,835 +1,162 @@
-import {
-  JFSortOrder,
-  JFGenreList,
-  JFAlbumList,
-  JFAlbumListSort,
-  JFAlbumDetail,
-  JFSongList,
-  JFSongListSort,
-  JFAlbumArtistList,
-  JFAlbumArtistListSort,
-  JFAlbumArtistDetail,
-  JFArtistList,
-  JFArtistListSort,
-  JFPlaylistList,
-  JFPlaylistDetail,
-  JFMusicFolderList,
-} from '/@/renderer/api/jellyfin.types';
-import {
-  NDSortOrder,
-  NDOrder,
-  NDGenreList,
-  NDAlbumList,
-  NDAlbumListSort,
-  NDAlbumDetail,
-  NDSongList,
-  NDSongListSort,
-  NDSongDetail,
-  NDAlbumArtistList,
-  NDAlbumArtistListSort,
-  NDAlbumArtistDetail,
-  NDDeletePlaylist,
-  NDPlaylistList,
-  NDPlaylistListSort,
-  NDPlaylistDetail,
-} from '/@/renderer/api/navidrome.types';
-import {
-  SSAlbumList,
-  SSAlbumDetail,
-  SSAlbumArtistList,
-  SSAlbumArtistDetail,
-  SSMusicFolderList,
-  SSGenreList,
-} from '/@/renderer/api/subsonic.types';
-
-export enum SortOrder {
-  ASC = 'ASC',
-  DESC = 'DESC',
+export interface BaseResponse<T> {
+  data: T;
+  error?: string | any;
+  response: 'Success' | 'Error';
+  statusCode: number;
 }
 
-export type ServerListItem = {
-  credential: string;
-  id: string;
-  name: string;
-  ndCredential?: string;
-  type: ServerType;
-  url: string;
-  userId: string | null;
-  username: string;
-};
-
-export enum ServerType {
-  JELLYFIN = 'jellyfin',
-  NAVIDROME = 'navidrome',
-  SUBSONIC = 'subsonic',
-}
-
-export type QueueSong = Song & {
-  uniqueId: string;
-};
-
-type SortOrderMap = {
-  jellyfin: Record<SortOrder, JFSortOrder>;
-  navidrome: Record<SortOrder, NDSortOrder>;
-  subsonic: Record<SortOrder, undefined>;
-};
-
-export const sortOrderMap: SortOrderMap = {
-  jellyfin: {
-    ASC: JFSortOrder.ASC,
-    DESC: JFSortOrder.DESC,
-  },
-  navidrome: {
-    ASC: NDSortOrder.ASC,
-    DESC: NDSortOrder.DESC,
-  },
-  subsonic: {
-    ASC: undefined,
-    DESC: undefined,
-  },
-};
-
-export enum ExternalSource {
-  LASTFM = 'LASTFM',
-  MUSICBRAINZ = 'MUSICBRAINZ',
-  SPOTIFY = 'SPOTIFY',
-  THEAUDIODB = 'THEAUDIODB',
-}
-
-export enum ExternalType {
-  ID = 'ID',
-  LINK = 'LINK',
-}
-
-export enum ImageType {
-  BACKDROP = 'BACKDROP',
-  LOGO = 'LOGO',
-  PRIMARY = 'PRIMARY',
-  SCREENSHOT = 'SCREENSHOT',
-}
-
-export type EndpointDetails = {
-  server: ServerListItem;
-};
-
 export interface BasePaginatedResponse<T> {
+  data: T;
   error?: string | any;
-  items: T;
-  startIndex: number;
-  totalRecordCount: number;
-}
-
-export type ApiError = {
-  error: {
-    message: string;
-    path: string;
-    trace: string[];
+  pagination: {
+    nextPage: string | null;
+    prevPage: string | null;
+    startIndex: number;
+    totalEntries: number;
   };
-  response: string;
+  response: 'Success' | 'Error';
   statusCode: number;
-};
+}
 
-export type AuthenticationResponse = {
-  credential: string;
-  ndCredential?: string;
-  userId: string | null;
+export interface BasePaginationRequest {
+  limit: number;
+  page: number;
+}
+
+export type ServerResponse = {
+  createdAt: string;
+  id: number;
+  name: string;
+  remoteUserId: string;
+  serverFolder?: ServerFolderResponse[];
+  serverType: string;
+  token: string;
+  updatedAt: string;
+  url: string;
   username: string;
 };
 
-export type Genre = {
-  id: string;
+export type ServerFolderResponse = {
+  createdAt: string;
+  enabled: boolean;
+  id: number;
+  isPublic: boolean;
   name: string;
+  remoteId: string;
+  serverId: number;
+  updatedAt: string;
 };
 
-export type Album = {
-  albumArtists: RelatedArtist[];
-  artists: RelatedArtist[];
-  backdropImageUrl: string | null;
+export type User = {
   createdAt: string;
-  duration: number | null;
-  genres: Genre[];
-  id: string;
-  imagePlaceholderUrl: string | null;
-  imageUrl: string | null;
-  isCompilation: boolean | null;
-  isFavorite: boolean;
-  lastPlayedAt: string | null;
-  name: string;
-  playCount: number | null;
-  rating: number | null;
-  releaseDate: string | null;
-  releaseYear: number | null;
-  serverType: ServerType;
-  size: number | null;
-  songCount: number | null;
-  songs?: Song[];
-  uniqueId: string;
+  enabled: boolean;
+  id: number;
+  isAdmin: boolean;
+  password: string;
   updatedAt: string;
-} & { songs?: Song[] };
+  username: string;
+};
 
-export type Song = {
-  album: string;
-  albumArtists: RelatedArtist[];
-  albumId: string;
-  artistName: string;
-  artists: RelatedArtist[];
+export type Login = {
+  accessToken: string;
+  refreshToken: string;
+} & User;
+
+export type Ping = {
+  description: string;
+  name: string;
+  version: string;
+};
+
+export type GenreResponse = {
+  createdAt: string;
+  id: number;
+  name: string;
+  updatedAt: string;
+};
+
+export type ArtistResponse = {
+  biography: string | null;
+  createdAt: string;
+  id: number;
+  name: string;
+  remoteCreatedAt: string | null;
+  remoteId: string;
+  serverFolderId: number;
+  updatedAt: string;
+};
+
+export type ExternalResponse = {
+  createdAt: string;
+  id: number;
+  name: string;
+  updatedAt: string;
+  url: string;
+};
+
+export type ImageResponse = {
+  createdAt: string;
+  id: number;
+  name: string;
+  updatedAt: string;
+  url: string;
+};
+
+export type PingResponse = BaseResponse<Ping>;
+
+export type LoginResponse = BaseResponse<Login>;
+
+export type UserResponse = BaseResponse<User>;
+
+export type AlbumResponse = BaseResponse<Album>;
+
+export type AlbumsResponse = BasePaginatedResponse<Album[]>;
+
+export interface Album {
+  _count: Count;
+  albumArtistId: number;
+  createdAt: string;
+  date: string;
+  genres: GenreResponse[];
+  id: number;
+  name: string;
+  remoteCreatedAt: string;
+  remoteId: string;
+  serverFolderId: number;
+  songs: Song[];
+  updatedAt: string;
+  year: number;
+}
+
+export interface Song {
+  album?: Partial<Album>;
+  albumId: number;
+  artistName: null;
+  artists?: ArtistResponse[];
   bitRate: number;
-  bpm: number | null;
-  channels: number | null;
-  compilation: boolean | null;
-  container: string | null;
+  container: string;
   createdAt: string;
-  discNumber: number;
+  date: string;
+  disc: number;
   duration: number;
-  genres: Genre[];
-  id: string;
-  imageUrl: string | null;
-  isFavorite: boolean;
-  lastPlayedAt: string | null;
+  externals?: ExternalResponse[];
+  id: number;
+  images?: ImageResponse[];
   name: string;
-  note: string | null;
-  path: string | null;
-  playCount: number;
-  releaseDate: string | null;
-  releaseYear: string | null;
-  serverId: string;
-  size: number;
-  streamUrl: string;
-  trackNumber: number;
-  type: ServerType;
-  uniqueId: string;
+  remoteCreatedAt: string;
+  remoteId: string;
+  serverFolderId: number;
+  track: number;
   updatedAt: string;
-};
-
-export type AlbumArtist = {
-  biography: string | null;
-  createdAt: string;
-  id: string;
-  name: string;
-  remoteCreatedAt: string | null;
-  serverFolderId: string;
-  updatedAt: string;
-};
-
-export type RelatedAlbumArtist = {
-  id: string;
-  name: string;
-};
-
-export type Artist = {
-  biography: string | null;
-  createdAt: string;
-  id: string;
-  name: string;
-  remoteCreatedAt: string | null;
-  serverFolderId: string;
-  updatedAt: string;
-};
-
-export type RelatedArtist = {
-  id: string;
-  name: string;
-};
-
-export type MusicFolder = {
-  id: string;
-  name: string;
-};
-
-export type Playlist = {
-  duration?: number;
-  id: string;
-  name: string;
-  public?: boolean;
-  size?: number;
-  songCount?: number;
-  userId: string;
-  username: string;
-};
-
-export type GenresResponse = Genre[];
-
-export type MusicFoldersResponse = MusicFolder[];
-
-export type ListSortOrder = NDOrder | JFSortOrder;
-
-type BaseEndpointArgs = {
-  server: ServerListItem | null;
-  signal?: AbortSignal;
-};
-
-// Genre List
-export type RawGenreListResponse = NDGenreList | JFGenreList | SSGenreList | undefined;
-
-export type GenreListResponse = BasePaginatedResponse<Genre[]> | null | undefined;
-
-export type GenreListArgs = { query: GenreListQuery } & BaseEndpointArgs;
-
-export type GenreListQuery = null;
-
-// Album List
-export type RawAlbumListResponse = NDAlbumList | SSAlbumList | JFAlbumList | undefined;
-
-export type AlbumListResponse = BasePaginatedResponse<Album[]> | null | undefined;
-
-export enum AlbumListSort {
-  ALBUM_ARTIST = 'albumArtist',
-  ARTIST = 'artist',
-  COMMUNITY_RATING = 'communityRating',
-  CRITIC_RATING = 'criticRating',
-  DURATION = 'duration',
-  FAVORITED = 'favorited',
-  NAME = 'name',
-  PLAY_COUNT = 'playCount',
-  RANDOM = 'random',
-  RATING = 'rating',
-  RECENTLY_ADDED = 'recentlyAdded',
-  RECENTLY_PLAYED = 'recentlyPlayed',
-  RELEASE_DATE = 'releaseDate',
-  SONG_COUNT = 'songCount',
-  YEAR = 'year',
+  year: number;
 }
 
-export type AlbumListQuery = {
-  jfParams?: {
-    albumArtistIds?: string;
-    artistIds?: string;
-    filters?: string;
-    genreIds?: string;
-    genres?: string;
-    isFavorite?: boolean;
-    maxYear?: number; // Parses to years
-    minYear?: number; // Parses to years
-    tags?: string;
-  };
-  limit?: number;
-  musicFolderId?: string;
-  ndParams?: {
-    artist_id?: string;
-    compilation?: boolean;
-    genre_id?: string;
-    has_rating?: boolean;
-    name?: string;
-    recently_played?: boolean;
-    starred?: boolean;
-    year?: number;
-  };
-  searchTerm?: string;
-  sortBy: AlbumListSort;
-  sortOrder: SortOrder;
-  startIndex: number;
+export type Count = {
+  artists?: number;
+  externals?: number;
+  favorites?: number;
+  genres?: number;
+  images?: number;
+  ratings?: number;
+  songs?: number;
 };
-
-export type AlbumListArgs = { query: AlbumListQuery } & BaseEndpointArgs;
-
-type AlbumListSortMap = {
-  jellyfin: Record<AlbumListSort, JFAlbumListSort | undefined>;
-  navidrome: Record<AlbumListSort, NDAlbumListSort | undefined>;
-  subsonic: Record<AlbumListSort, undefined>;
-};
-
-export const albumListSortMap: AlbumListSortMap = {
-  jellyfin: {
-    albumArtist: JFAlbumListSort.ALBUM_ARTIST,
-    artist: undefined,
-    communityRating: JFAlbumListSort.COMMUNITY_RATING,
-    criticRating: JFAlbumListSort.CRITIC_RATING,
-    duration: undefined,
-    favorited: undefined,
-    name: JFAlbumListSort.NAME,
-    playCount: undefined,
-    random: JFAlbumListSort.RANDOM,
-    rating: undefined,
-    recentlyAdded: JFAlbumListSort.RECENTLY_ADDED,
-    recentlyPlayed: undefined,
-    releaseDate: JFAlbumListSort.RELEASE_DATE,
-    songCount: undefined,
-    year: undefined,
-  },
-  navidrome: {
-    albumArtist: NDAlbumListSort.ALBUM_ARTIST,
-    artist: NDAlbumListSort.ARTIST,
-    communityRating: undefined,
-    criticRating: undefined,
-    duration: NDAlbumListSort.DURATION,
-    favorited: NDAlbumListSort.STARRED,
-    name: NDAlbumListSort.NAME,
-    playCount: NDAlbumListSort.PLAY_COUNT,
-    random: NDAlbumListSort.RANDOM,
-    rating: NDAlbumListSort.RATING,
-    recentlyAdded: NDAlbumListSort.RECENTLY_ADDED,
-    recentlyPlayed: NDAlbumListSort.PLAY_DATE,
-    releaseDate: undefined,
-    songCount: NDAlbumListSort.SONG_COUNT,
-    year: NDAlbumListSort.YEAR,
-  },
-  subsonic: {
-    albumArtist: undefined,
-    artist: undefined,
-    communityRating: undefined,
-    criticRating: undefined,
-    duration: undefined,
-    favorited: undefined,
-    name: undefined,
-    playCount: undefined,
-    random: undefined,
-    rating: undefined,
-    recentlyAdded: undefined,
-    recentlyPlayed: undefined,
-    releaseDate: undefined,
-    songCount: undefined,
-    year: undefined,
-  },
-};
-
-// Album Detail
-export type RawAlbumDetailResponse = NDAlbumDetail | SSAlbumDetail | JFAlbumDetail | undefined;
-
-export type AlbumDetailResponse = Album | null | undefined;
-
-export type AlbumDetailQuery = { id: string };
-
-export type AlbumDetailArgs = { query: AlbumDetailQuery } & BaseEndpointArgs;
-
-// Song List
-export type RawSongListResponse = NDSongList | JFSongList | undefined;
-
-export type SongListResponse = BasePaginatedResponse<Song[]>;
-
-export enum SongListSort {
-  ALBUM = 'album',
-  ALBUM_ARTIST = 'albumArtist',
-  ARTIST = 'artist',
-  BPM = 'bpm',
-  CHANNELS = 'channels',
-  COMMENT = 'comment',
-  DURATION = 'duration',
-  FAVORITED = 'favorited',
-  GENRE = 'genre',
-  NAME = 'name',
-  PLAY_COUNT = 'playCount',
-  RANDOM = 'random',
-  RATING = 'rating',
-  RECENTLY_ADDED = 'recentlyAdded',
-  RECENTLY_PLAYED = 'recentlyPlayed',
-  RELEASE_DATE = 'releaseDate',
-  YEAR = 'year',
-}
-
-export type SongListQuery = {
-  albumIds?: string[];
-  jfParams?: {
-    filters?: string;
-    genreIds?: string;
-    genres?: string;
-    includeItemTypes: 'Audio';
-    isFavorite?: boolean;
-    maxYear?: number; // Parses to years
-    minYear?: number; // Parses to years
-    sortBy?: JFSongListSort;
-    years?: string;
-  };
-  limit?: number;
-  musicFolderId?: string;
-  ndParams?: {
-    artist_id?: string;
-    compilation?: boolean;
-    genre_id?: string;
-    has_rating?: boolean;
-    starred?: boolean;
-    title?: string;
-    year?: number;
-  };
-  searchTerm?: string;
-  sortBy: SongListSort;
-  sortOrder: SortOrder;
-  startIndex: number;
-};
-
-export type SongListArgs = { query: SongListQuery } & BaseEndpointArgs;
-
-type SongListSortMap = {
-  jellyfin: Record<SongListSort, JFSongListSort | undefined>;
-  navidrome: Record<SongListSort, NDSongListSort | undefined>;
-  subsonic: Record<SongListSort, undefined>;
-};
-
-export const songListSortMap: SongListSortMap = {
-  jellyfin: {
-    album: JFSongListSort.ALBUM,
-    albumArtist: JFSongListSort.ALBUM_ARTIST,
-    artist: JFSongListSort.ARTIST,
-    bpm: undefined,
-    channels: undefined,
-    comment: undefined,
-    duration: JFSongListSort.DURATION,
-    favorited: undefined,
-    genre: undefined,
-    name: JFSongListSort.NAME,
-    playCount: JFSongListSort.PLAY_COUNT,
-    random: JFSongListSort.RANDOM,
-    rating: undefined,
-    recentlyAdded: JFSongListSort.RECENTLY_ADDED,
-    recentlyPlayed: JFSongListSort.RECENTLY_PLAYED,
-    releaseDate: JFSongListSort.RELEASE_DATE,
-    year: undefined,
-  },
-  navidrome: {
-    album: NDSongListSort.ALBUM,
-    albumArtist: NDSongListSort.ALBUM_ARTIST,
-    artist: NDSongListSort.ARTIST,
-    bpm: NDSongListSort.BPM,
-    channels: NDSongListSort.CHANNELS,
-    comment: NDSongListSort.COMMENT,
-    duration: NDSongListSort.DURATION,
-    favorited: NDSongListSort.FAVORITED,
-    genre: NDSongListSort.GENRE,
-    name: NDSongListSort.TITLE,
-    playCount: NDSongListSort.PLAY_COUNT,
-    random: undefined,
-    rating: NDSongListSort.RATING,
-    recentlyAdded: NDSongListSort.PLAY_DATE,
-    recentlyPlayed: NDSongListSort.PLAY_DATE,
-    releaseDate: undefined,
-    year: NDSongListSort.YEAR,
-  },
-  subsonic: {
-    album: undefined,
-    albumArtist: undefined,
-    artist: undefined,
-    bpm: undefined,
-    channels: undefined,
-    comment: undefined,
-    duration: undefined,
-    favorited: undefined,
-    genre: undefined,
-    name: undefined,
-    playCount: undefined,
-    random: undefined,
-    rating: undefined,
-    recentlyAdded: undefined,
-    recentlyPlayed: undefined,
-    releaseDate: undefined,
-    year: undefined,
-  },
-};
-
-// Song Detail
-export type RawSongDetailResponse = NDSongDetail | undefined;
-
-export type SongDetailResponse = Song | null | undefined;
-
-export type SongDetailQuery = { id: string };
-
-export type SongDetailArgs = { query: SongDetailQuery } & BaseEndpointArgs;
-
-// Album Artist List
-export type RawAlbumArtistListResponse =
-  | NDAlbumArtistList
-  | SSAlbumArtistList
-  | JFAlbumArtistList
-  | undefined;
-
-export type AlbumArtistListResponse = BasePaginatedResponse<AlbumArtist[]>;
-
-export enum AlbumArtistListSort {
-  ALBUM = 'album',
-  ALBUM_COUNT = 'albumCount',
-  DURATION = 'duration',
-  FAVORITED = 'favorited',
-  NAME = 'name',
-  PLAY_COUNT = 'playCount',
-  RANDOM = 'random',
-  RATING = 'rating',
-  RECENTLY_ADDED = 'recentlyAdded',
-  RELEASE_DATE = 'releaseDate',
-  SONG_COUNT = 'songCount',
-}
-
-export type AlbumArtistListQuery = {
-  limit?: number;
-  musicFolderId?: string;
-  ndParams?: {
-    genre_id?: string;
-    name?: string;
-    starred?: boolean;
-  };
-  sortBy: AlbumArtistListSort;
-  sortOrder: SortOrder;
-  startIndex: number;
-};
-
-export type AlbumArtistListArgs = { query: AlbumArtistListQuery } & BaseEndpointArgs;
-
-type AlbumArtistListSortMap = {
-  jellyfin: Record<AlbumArtistListSort, JFAlbumArtistListSort | undefined>;
-  navidrome: Record<AlbumArtistListSort, NDAlbumArtistListSort | undefined>;
-  subsonic: Record<AlbumArtistListSort, undefined>;
-};
-
-export const albumArtistListSortMap: AlbumArtistListSortMap = {
-  jellyfin: {
-    album: JFAlbumArtistListSort.ALBUM,
-    albumCount: undefined,
-    duration: JFAlbumArtistListSort.DURATION,
-    favorited: undefined,
-    name: JFAlbumArtistListSort.NAME,
-    playCount: undefined,
-    random: JFAlbumArtistListSort.RANDOM,
-    rating: undefined,
-    recentlyAdded: JFAlbumArtistListSort.RECENTLY_ADDED,
-    releaseDate: undefined,
-    songCount: undefined,
-  },
-  navidrome: {
-    album: undefined,
-    albumCount: NDAlbumArtistListSort.ALBUM_COUNT,
-    duration: undefined,
-    favorited: NDAlbumArtistListSort.FAVORITED,
-    name: NDAlbumArtistListSort.NAME,
-    playCount: NDAlbumArtistListSort.PLAY_COUNT,
-    random: undefined,
-    rating: NDAlbumArtistListSort.RATING,
-    recentlyAdded: undefined,
-    releaseDate: undefined,
-    songCount: NDAlbumArtistListSort.SONG_COUNT,
-  },
-  subsonic: {
-    album: undefined,
-    albumCount: undefined,
-    duration: undefined,
-    favorited: undefined,
-    name: undefined,
-    playCount: undefined,
-    random: undefined,
-    rating: undefined,
-    recentlyAdded: undefined,
-    releaseDate: undefined,
-    songCount: undefined,
-  },
-};
-
-// Album Artist Detail
-export type RawAlbumArtistDetailResponse =
-  | NDAlbumArtistDetail
-  | SSAlbumArtistDetail
-  | JFAlbumArtistDetail
-  | undefined;
-
-export type AlbumArtistDetailResponse = BasePaginatedResponse<AlbumArtist[]>;
-
-export type AlbumArtistDetailQuery = { id: string };
-
-export type AlbumArtistDetailArgs = { query: AlbumArtistDetailQuery } & BaseEndpointArgs;
-
-// Artist List
-export type RawArtistListResponse = JFArtistList | undefined;
-
-export type ArtistListResponse = BasePaginatedResponse<Artist[]>;
-
-export enum ArtistListSort {
-  ALBUM = 'album',
-  ALBUM_COUNT = 'albumCount',
-  DURATION = 'duration',
-  FAVORITED = 'favorited',
-  NAME = 'name',
-  PLAY_COUNT = 'playCount',
-  RANDOM = 'random',
-  RATING = 'rating',
-  RECENTLY_ADDED = 'recentlyAdded',
-  RELEASE_DATE = 'releaseDate',
-  SONG_COUNT = 'songCount',
-}
-
-export type ArtistListQuery = {
-  limit?: number;
-  musicFolderId?: string;
-  ndParams?: {
-    genre_id?: string;
-    name?: string;
-    starred?: boolean;
-  };
-  sortBy: ArtistListSort;
-  sortOrder: SortOrder;
-  startIndex: number;
-};
-
-export type ArtistListArgs = { query: ArtistListQuery } & BaseEndpointArgs;
-
-type ArtistListSortMap = {
-  jellyfin: Record<ArtistListSort, JFArtistListSort | undefined>;
-  navidrome: Record<ArtistListSort, undefined>;
-  subsonic: Record<ArtistListSort, undefined>;
-};
-
-export const artistListSortMap: ArtistListSortMap = {
-  jellyfin: {
-    album: JFArtistListSort.ALBUM,
-    albumCount: undefined,
-    duration: JFArtistListSort.DURATION,
-    favorited: undefined,
-    name: JFArtistListSort.NAME,
-    playCount: undefined,
-    random: JFArtistListSort.RANDOM,
-    rating: undefined,
-    recentlyAdded: JFArtistListSort.RECENTLY_ADDED,
-    releaseDate: undefined,
-    songCount: undefined,
-  },
-  navidrome: {
-    album: undefined,
-    albumCount: undefined,
-    duration: undefined,
-    favorited: undefined,
-    name: undefined,
-    playCount: undefined,
-    random: undefined,
-    rating: undefined,
-    recentlyAdded: undefined,
-    releaseDate: undefined,
-    songCount: undefined,
-  },
-  subsonic: {
-    album: undefined,
-    albumCount: undefined,
-    duration: undefined,
-    favorited: undefined,
-    name: undefined,
-    playCount: undefined,
-    random: undefined,
-    rating: undefined,
-    recentlyAdded: undefined,
-    releaseDate: undefined,
-    songCount: undefined,
-  },
-};
-
-// Artist Detail
-
-// Favorite
-export type RawFavoriteResponse = FavoriteResponse | undefined;
-
-export type FavoriteResponse = { id: string };
-
-export type FavoriteQuery = { id: string; type?: 'song' | 'album' | 'albumArtist' };
-
-export type FavoriteArgs = { query: FavoriteQuery } & BaseEndpointArgs;
-
-// Rating
-export type RawRatingResponse = null | undefined;
-
-export type RatingResponse = null;
-
-export type RatingQuery = { id: string; rating: number };
-
-export type RatingArgs = { query: RatingQuery } & BaseEndpointArgs;
-
-// Create Playlist
-export type RawCreatePlaylistResponse = CreatePlaylistResponse | undefined;
-
-export type CreatePlaylistResponse = { id: string; name: string };
-
-export type CreatePlaylistQuery = { comment?: string; name: string; public?: boolean };
-
-export type CreatePlaylistArgs = { query: CreatePlaylistQuery } & BaseEndpointArgs;
-
-// Delete Playlist
-export type RawDeletePlaylistResponse = NDDeletePlaylist | undefined;
-
-export type DeletePlaylistResponse = null;
-
-export type DeletePlaylistQuery = { id: string };
-
-export type DeletePlaylistArgs = { query: DeletePlaylistQuery } & BaseEndpointArgs;
-
-// Playlist List
-export type RawPlaylistListResponse = NDPlaylistList | JFPlaylistList | undefined;
-
-export type PlaylistListResponse = BasePaginatedResponse<Playlist[]>;
-
-export type PlaylistListSort = NDPlaylistListSort;
-
-export type PlaylistListQuery = {
-  limit?: number;
-  musicFolderId?: string;
-  sortBy: PlaylistListSort;
-  sortOrder: SortOrder;
-  startIndex: number;
-};
-
-export type PlaylistListArgs = { query: PlaylistListQuery } & BaseEndpointArgs;
-
-type PlaylistListSortMap = {
-  jellyfin: Record<PlaylistListSort, undefined>;
-  navidrome: Record<PlaylistListSort, NDPlaylistListSort | undefined>;
-  subsonic: Record<PlaylistListSort, undefined>;
-};
-
-export const playlistListSortMap: PlaylistListSortMap = {
-  jellyfin: {
-    duration: undefined,
-    name: undefined,
-    owner: undefined,
-    public: undefined,
-    songCount: undefined,
-    updatedAt: undefined,
-  },
-  navidrome: {
-    duration: NDPlaylistListSort.DURATION,
-    name: NDPlaylistListSort.NAME,
-    owner: NDPlaylistListSort.OWNER,
-    public: NDPlaylistListSort.PUBLIC,
-    songCount: NDPlaylistListSort.SONG_COUNT,
-    updatedAt: NDPlaylistListSort.UPDATED_AT,
-  },
-  subsonic: {
-    duration: undefined,
-    name: undefined,
-    owner: undefined,
-    public: undefined,
-    songCount: undefined,
-    updatedAt: undefined,
-  },
-};
-
-// Playlist Detail
-export type RawPlaylistDetailResponse = NDPlaylistDetail | JFPlaylistDetail | undefined;
-
-export type PlaylistDetailResponse = BasePaginatedResponse<Playlist[]>;
-
-export type PlaylistDetailQuery = {
-  id: string;
-};
-
-export type PlaylistDetailArgs = { query: PlaylistDetailQuery } & BaseEndpointArgs;
-
-// Playlist Songs
-export type RawPlaylistSongListResponse = JFSongList | undefined;
-
-export type PlaylistSongListResponse = BasePaginatedResponse<Song[]>;
-
-export type PlaylistSongListQuery = {
-  id: string;
-  limit?: number;
-  sortBy?: SongListSort;
-  sortOrder?: SortOrder;
-  startIndex: number;
-};
-
-export type PlaylistSongListArgs = { query: PlaylistSongListQuery } & BaseEndpointArgs;
-
-// Music Folder List
-export type RawMusicFolderListResponse = SSMusicFolderList | JFMusicFolderList | undefined;
-
-export type MusicFolderListResponse = BasePaginatedResponse<Playlist[]>;
-
-export type MusicFolderListArgs = BaseEndpointArgs;
-
-// Create Favorite
-export type RawCreateFavoriteResponse = CreateFavoriteResponse | undefined;
-
-export type CreateFavoriteResponse = { id: string };
-
-export type CreateFavoriteQuery = { comment?: string; name: string; public?: boolean };
-
-export type CreateFavoriteArgs = { query: CreateFavoriteQuery } & BaseEndpointArgs;

src/renderer/api/usersApi.ts

@@ -0,0 +1,11 @@
+import { api } from 'renderer/lib';
+import { UserResponse } from './types';
+
+const getUsers = async () => {
+  const { data } = await api.get<UserResponse>('/users');
+  return data;
+};
+
+export const usersApi = {
+  getUsers,
+};

src/renderer/app.tsx

@@ -1,110 +1,54 @@
-import { useEffect } from 'react';
-import { ClientSideRowModelModule } from '@ag-grid-community/client-side-row-model';
-import { ModuleRegistry } from '@ag-grid-community/core';
-import { InfiniteRowModelModule } from '@ag-grid-community/infinite-row-model';
+import { ReactNode, useEffect } from 'react';
 import { MantineProvider } from '@mantine/core';
-import { ModalsProvider } from '@mantine/modals';
-import { NotificationsProvider } from '@mantine/notifications';
-import { QueryClientProvider } from '@tanstack/react-query';
-import { initSimpleImg } from 'react-simple-img';
-import { BaseContextModal } from './components';
-import { useTheme } from './hooks';
-import { queryClient } from './lib/react-query';
-import { AppRouter } from './router/app-router';
-import { useSettingsStore } from './store/settings.store';
+import { useLocalStorage } from '@mantine/hooks';
+import isElectron from 'is-electron';
+import { BrowserRouter, HashRouter } from 'react-router-dom';
+import { useDefaultSettings } from './features/settings';
+import { AppRouter } from './router/AppRouter';
 import './styles/global.scss';
-import '@ag-grid-community/styles/ag-grid.css';
-import { ContextMenuProvider } from '/@/renderer/features/context-menu';
 
-ModuleRegistry.registerModules([ClientSideRowModelModule, InfiniteRowModelModule]);
+const SelectRouter = ({ children }: { children: ReactNode }) => {
+  if (isElectron()) {
+    return <HashRouter>{children}</HashRouter>;
+  }
 
-initSimpleImg({ threshold: 0.05 }, true);
+  return <BrowserRouter>{children}</BrowserRouter>;
+};
 
 export const App = () => {
-  const theme = useTheme();
-  const contentFont = useSettingsStore((state) => state.general.fontContent);
+  const [theme] = useLocalStorage({
+    defaultValue: 'dark',
+    key: 'theme',
+  });
+
+  useDefaultSettings();
 
   useEffect(() => {
-    const root = document.documentElement;
-    root.style.setProperty('--content-font-family', contentFont);
-  }, [contentFont]);
+    document.body.setAttribute('data-theme', theme);
+  }, [theme]);
 
   return (
-    <QueryClientProvider client={queryClient}>
-      <MantineProvider
-        withGlobalStyles
-        withNormalizeCSS
-        theme={{
-          breakpoints: {
-            lg: 1200,
-            md: 1000,
-            sm: 800,
-            xl: 1400,
-            xs: 500,
-          },
-          colorScheme: theme as 'light' | 'dark',
-          components: { Modal: { styles: { body: { padding: '.5rem' } } } },
-          defaultRadius: 'xs',
-          dir: 'ltr',
-          focusRing: 'auto',
-          focusRingStyles: {
-            inputStyles: () => ({
-              border: '1px solid var(--primary-color)',
-            }),
-            resetStyles: () => ({ outline: 'none' }),
-            styles: () => ({
-              outline: '1px solid var(--primary-color)',
-              outlineOffset: '-1px',
-            }),
-          },
-          fontFamily: 'var(--content-font-family)',
-          fontSizes: {
-            lg: 16,
-            md: 14,
-            sm: 12,
-            xl: 18,
-            xs: 10,
-          },
-          headings: { fontFamily: 'var(--content-font-family)' },
-          other: {},
-          spacing: {
-            lg: 12,
-            md: 8,
-            sm: 4,
-            xl: 16,
-            xs: 2,
-          },
-        }}
-      >
-        <NotificationsProvider
-          autoClose={1500}
-          position="bottom-right"
-          style={{
-            marginBottom: '85px',
-            opacity: '.8',
-            userSelect: 'none',
-            width: '250px',
-          }}
-          transitionDuration={200}
-        >
-          <ModalsProvider
-            modalProps={{
-              centered: true,
-              exitTransitionDuration: 300,
-              overflow: 'inside',
-              overlayBlur: 0,
-              overlayOpacity: 0.8,
-              transition: 'slide-down',
-              transitionDuration: 300,
-            }}
-            modals={{ base: BaseContextModal }}
-          >
-            <ContextMenuProvider>
-              <AppRouter />
-            </ContextMenuProvider>
-          </ModalsProvider>
-        </NotificationsProvider>
-      </MantineProvider>
-    </QueryClientProvider>
+    <MantineProvider
+      theme={{
+        colorScheme: 'dark',
+        defaultRadius: 'xs',
+        focusRing: 'auto',
+        fontSizes: {
+          lg: 16,
+          md: 14,
+          sm: 12,
+          xl: 18,
+          xs: 10,
+        },
+        other: {},
+        spacing: {
+          xs: 2,
+        },
+      }}
+    >
+      <SelectRouter>
+        <AppRouter />
+      </SelectRouter>
+    </MantineProvider>
   );
 };

src/renderer/components/accordion/index.tsx

@@ -1,23 +0,0 @@
-import type { AccordionProps as MantineAccordionProps } from '@mantine/core';
-import { Accordion as MantineAccordion } from '@mantine/core';
-import styled from 'styled-components';
-
-type AccordionProps = MantineAccordionProps;
-
-const StyledAccordion = styled(MantineAccordion)`
-  & .mantine-Accordion-panel {
-    background: var(--paper-bg);
-  }
-
-  .mantine-Accordion-control {
-    background: var(--paper-bg);
-  }
-`;
-
-export const Accordion = ({ children, ...props }: AccordionProps) => {
-  return <StyledAccordion {...props}>{children}</StyledAccordion>;
-};
-
-Accordion.Control = StyledAccordion.Control;
-Accordion.Item = StyledAccordion.Item;
-Accordion.Panel = StyledAccordion.Panel;

src/renderer/components/audio-player/AudioPlayer.tsx

@@ -1,24 +1,27 @@
-import { useImperativeHandle, forwardRef, useRef, useState, useCallback, useEffect } from 'react';
-import isElectron from 'is-electron';
-import type { ReactPlayerProps } from 'react-player';
-import ReactPlayer from 'react-player';
-import type { Song } from '/@/renderer/api/types';
 import {
-  crossfadeHandler,
-  gaplessHandler,
-} from '/@/renderer/components/audio-player/utils/list-handlers';
-import { useSettingsStore } from '/@/renderer/store/settings.store';
-import type { CrossfadeStyle } from '/@/renderer/types';
-import { PlaybackStyle, PlayerStatus } from '/@/renderer/types';
+  useImperativeHandle,
+  forwardRef,
+  useRef,
+  useState,
+  useCallback,
+} from 'react';
+import ReactPlayer, { ReactPlayerProps } from 'react-player';
+import {
+  CrossfadeStyle,
+  PlaybackStyle,
+  PlayerStatus,
+  Song,
+} from '../../../types';
+import { crossfadeHandler, gaplessHandler } from './utils/listenHandlers';
 
 interface AudioPlayerProps extends ReactPlayerProps {
   crossfadeDuration: number;
   crossfadeStyle: CrossfadeStyle;
   currentPlayer: 1 | 2;
-  playbackStyle: PlaybackStyle;
   player1: Song;
   player2: Song;
   status: PlayerStatus;
+  style: PlaybackStyle;
   volume: number;
 }
 
@@ -37,7 +40,7 @@ export const AudioPlayer = forwardRef(
   (
     {
       status,
-      playbackStyle,
+      style,
       crossfadeStyle,
       crossfadeDuration,
       currentPlayer,
@@ -47,12 +50,11 @@ export const AudioPlayer = forwardRef(
       muted,
       volume,
     }: AudioPlayerProps,
-    ref: any,
+    ref: any
   ) => {
     const player1Ref = useRef<any>(null);
     const player2Ref = useRef<any>(null);
     const [isTransitioning, setIsTransitioning] = useState(false);
-    const audioDeviceId = useSettingsStore((state) => state.player.audioDeviceId);
 
     useImperativeHandle(ref, () => ({
       get player1() {
@@ -68,19 +70,6 @@ export const AudioPlayer = forwardRef(
       setIsTransitioning(false);
     };
 
-    useEffect(() => {
-      if (status === PlayerStatus.PLAYING) {
-        if (currentPlayer === 1) {
-          player1Ref.current?.getInternalPlayer()?.play();
-        } else {
-          player2Ref.current?.getInternalPlayer()?.play();
-        }
-      } else {
-        player1Ref.current?.getInternalPlayer()?.pause();
-        player2Ref.current?.getInternalPlayer()?.pause();
-      }
-    }, [currentPlayer, status]);
-
     const handleCrossfade1 = useCallback(
       (e: AudioPlayerProgress) => {
         return crossfadeHandler({
@@ -97,7 +86,13 @@ export const AudioPlayer = forwardRef(
           volume,
         });
       },
-      [crossfadeDuration, crossfadeStyle, currentPlayer, isTransitioning, volume],
+      [
+        crossfadeDuration,
+        crossfadeStyle,
+        currentPlayer,
+        isTransitioning,
+        volume,
+      ]
     );
 
     const handleCrossfade2 = useCallback(
@@ -116,7 +111,13 @@ export const AudioPlayer = forwardRef(
           volume,
         });
       },
-      [crossfadeDuration, crossfadeStyle, currentPlayer, isTransitioning, volume],
+      [
+        crossfadeDuration,
+        crossfadeStyle,
+        currentPlayer,
+        isTransitioning,
+        volume,
+      ]
     );
 
     const handleGapless1 = useCallback(
@@ -124,13 +125,13 @@ export const AudioPlayer = forwardRef(
         return gaplessHandler({
           currentTime: e.playedSeconds,
           duration: getDuration(player1Ref),
-          isFlac: player1?.container === 'flac',
+          isFlac: player1?.suffix === 'flac',
           isTransitioning,
           nextPlayerRef: player2Ref,
           setIsTransitioning,
         });
       },
-      [isTransitioning, player1?.container],
+      [isTransitioning, player1?.suffix]
     );
 
     const handleGapless2 = useCallback(
@@ -138,54 +139,46 @@ export const AudioPlayer = forwardRef(
         return gaplessHandler({
           currentTime: e.playedSeconds,
           duration: getDuration(player2Ref),
-          isFlac: player2?.container === 'flac',
+          isFlac: player2?.suffix === 'flac',
           isTransitioning,
           nextPlayerRef: player1Ref,
           setIsTransitioning,
         });
       },
-      [isTransitioning, player2?.container],
+      [isTransitioning, player2?.suffix]
     );
 
-    useEffect(() => {
-      if (isElectron()) {
-        if (audioDeviceId) {
-          player1Ref.current?.getInternalPlayer()?.setSinkId(audioDeviceId);
-          player2Ref.current?.getInternalPlayer()?.setSinkId(audioDeviceId);
-        } else {
-          player1Ref.current?.getInternalPlayer()?.setSinkId('');
-          player2Ref.current?.getInternalPlayer()?.setSinkId('');
-        }
-      }
-    }, [audioDeviceId]);
-
     return (
       <>
         <ReactPlayer
           ref={player1Ref}
           height={0}
           muted={muted}
-          playing={currentPlayer === 1 && status === PlayerStatus.PLAYING}
+          playing={currentPlayer === 1 && status === PlayerStatus.Playing}
           progressInterval={isTransitioning ? 10 : 250}
           url={player1?.streamUrl}
           volume={volume}
           width={0}
           onEnded={handleOnEnded}
-          onProgress={playbackStyle === PlaybackStyle.GAPLESS ? handleGapless1 : handleCrossfade1}
+          onProgress={
+            style === PlaybackStyle.Gapless ? handleGapless1 : handleCrossfade1
+          }
         />
         <ReactPlayer
           ref={player2Ref}
           height={0}
           muted={muted}
-          playing={currentPlayer === 2 && status === PlayerStatus.PLAYING}
+          playing={currentPlayer === 2 && status === PlayerStatus.Playing}
           progressInterval={isTransitioning ? 10 : 250}
           url={player2?.streamUrl}
           volume={volume}
           width={0}
           onEnded={handleOnEnded}
-          onProgress={playbackStyle === PlaybackStyle.GAPLESS ? handleGapless2 : handleCrossfade2}
+          onProgress={
+            style === PlaybackStyle.Gapless ? handleGapless2 : handleCrossfade2
+          }
         />
       </>
     );
-  },
+  }
 );

src/renderer/components/audio-player/utils/listenHandlers.ts

@@ -1,6 +1,6 @@
 /* eslint-disable no-nested-ternary */
-import type { Dispatch } from 'react';
-import { CrossfadeStyle } from '/@/renderer/types';
+import { Dispatch } from 'react';
+import { CrossfadeStyle } from '../../../../types';
 
 export const gaplessHandler = (args: {
   currentTime: number;
@@ -10,8 +10,14 @@ export const gaplessHandler = (args: {
   nextPlayerRef: any;
   setIsTransitioning: Dispatch<boolean>;
 }) => {
-  const { nextPlayerRef, currentTime, duration, isTransitioning, setIsTransitioning, isFlac } =
-    args;
+  const {
+    nextPlayerRef,
+    currentTime,
+    duration,
+    isTransitioning,
+    setIsTransitioning,
+    isFlac,
+  } = args;
 
   if (!isTransitioning) {
     if (currentTime > duration - 2) {
@@ -75,12 +81,15 @@ export const crossfadeHandler = (args: {
     case 'equalPower':
       // https://dsp.stackexchange.com/a/14755
       percentageOfFadeLeft = (timeLeft / fadeDuration) * 2;
-      currentPlayerVolumeCalculation = Math.sqrt(0.5 * percentageOfFadeLeft) * volume;
-      nextPlayerVolumeCalculation = Math.sqrt(0.5 * (2 - percentageOfFadeLeft)) * volume;
+      currentPlayerVolumeCalculation =
+        Math.sqrt(0.5 * percentageOfFadeLeft) * volume;
+      nextPlayerVolumeCalculation =
+        Math.sqrt(0.5 * (2 - percentageOfFadeLeft)) * volume;
       break;
     case 'linear':
       currentPlayerVolumeCalculation = (timeLeft / fadeDuration) * volume;
-      nextPlayerVolumeCalculation = ((fadeDuration - timeLeft) / fadeDuration) * volume;
+      nextPlayerVolumeCalculation =
+        ((fadeDuration - timeLeft) / fadeDuration) * volume;
       break;
     case 'dipped':
       // https://math.stackexchange.com/a/4622
@@ -101,14 +110,19 @@ export const crossfadeHandler = (args: {
 
       percentageOfFadeLeft = timeLeft / fadeDuration;
       currentPlayerVolumeCalculation =
-        Math.cos((Math.PI / 4) * ((2 * percentageOfFadeLeft - 1) ** (2 * n + 1) - 1)) * volume;
+        Math.cos(
+          (Math.PI / 4) * ((2 * percentageOfFadeLeft - 1) ** (2 * n + 1) - 1)
+        ) * volume;
       nextPlayerVolumeCalculation =
-        Math.cos((Math.PI / 4) * ((2 * percentageOfFadeLeft - 1) ** (2 * n + 1) + 1)) * volume;
+        Math.cos(
+          (Math.PI / 4) * ((2 * percentageOfFadeLeft - 1) ** (2 * n + 1) + 1)
+        ) * volume;
       break;
 
     default:
       currentPlayerVolumeCalculation = (timeLeft / fadeDuration) * volume;
-      nextPlayerVolumeCalculation = ((fadeDuration - timeLeft) / fadeDuration) * volume;
+      nextPlayerVolumeCalculation =
+        ((fadeDuration - timeLeft) / fadeDuration) * volume;
       break;
   }
 
@@ -116,7 +130,9 @@ export const crossfadeHandler = (args: {
     currentPlayerVolumeCalculation >= 0 ? currentPlayerVolumeCalculation : 0;
 
   const nextPlayerVolume =
-    nextPlayerVolumeCalculation <= volume ? nextPlayerVolumeCalculation : volume;
+    nextPlayerVolumeCalculation <= volume
+      ? nextPlayerVolumeCalculation
+      : volume;
 
   if (currentPlayer === 1) {
     currentPlayerRef.current.getInternalPlayer().volume = currentPlayerVolume;

src/renderer/components/badge/index.tsx

@@ -1,33 +0,0 @@
-import type { BadgeProps as MantineBadgeProps } from '@mantine/core';
-import { createPolymorphicComponent, Badge as MantineBadge } from '@mantine/core';
-import styled from 'styled-components';
-
-export type BadgeProps = MantineBadgeProps;
-
-const StyledBadge = styled(MantineBadge)<BadgeProps>`
-  .mantine-Badge-root {
-    color: var(--badge-fg);
-  }
-
-  .mantine-Badge-inner {
-    padding: 0 0.5rem;
-    color: var(--badge-fg);
-  }
-`;
-
-const _Badge = ({ children, ...props }: BadgeProps) => {
-  return (
-    <StyledBadge
-      radius="md"
-      size="sm"
-      styles={{
-        root: { background: 'var(--badge-bg)' },
-      }}
-      {...props}
-    >
-      {children}
-    </StyledBadge>
-  );
-};
-
-export const Badge = createPolymorphicComponent<'button', BadgeProps>(_Badge);

src/renderer/components/button/Button.tsx

@@ -0,0 +1,10 @@
+import { ReactNode } from 'react';
+import { Button as MantineButton } from '@mantine/core';
+
+interface ButtonProps {
+  icon?: ReactNode;
+}
+
+export const Button = ({ icon }: ButtonProps) => {
+  return <MantineButton>Button</MantineButton>;
+};

src/renderer/components/button/index.tsx

@@ -1,290 +0,0 @@
-import type { Ref } from 'react';
-import React, { useRef, useCallback, useState, forwardRef } from 'react';
-import type { ButtonProps as MantineButtonProps, TooltipProps } from '@mantine/core';
-import { Button as MantineButton, createPolymorphicComponent } from '@mantine/core';
-import { useTimeout } from '@mantine/hooks';
-import styled from 'styled-components';
-import { Spinner } from '/@/renderer/components/spinner';
-import { Tooltip } from '/@/renderer/components/tooltip';
-
-export interface ButtonProps extends MantineButtonProps {
-  children: React.ReactNode;
-  loading?: boolean;
-  onClick?: (e: React.MouseEvent<HTMLButtonElement, MouseEvent>) => void;
-  onMouseDown?: (e: React.MouseEvent<HTMLButtonElement, MouseEvent>) => void;
-  tooltip?: Omit<TooltipProps, 'children'>;
-}
-
-interface StyledButtonProps extends ButtonProps {
-  ref: Ref<HTMLButtonElement>;
-}
-
-const StyledButton = styled(MantineButton)<StyledButtonProps>`
-  color: ${(props) => {
-    switch (props.variant) {
-      case 'default':
-        return 'var(--btn-default-fg)';
-      case 'filled':
-        return 'var(--btn-primary-fg)';
-      case 'subtle':
-        return 'var(--btn-subtle-fg)';
-      default:
-        return '';
-    }
-  }};
-  background: ${(props) => {
-    switch (props.variant) {
-      case 'default':
-        return 'var(--btn-default-bg)';
-      case 'filled':
-        return 'var(--btn-primary-bg)';
-      case 'subtle':
-        return 'var(--btn-subtle-bg)';
-      default:
-        return '';
-    }
-  }};
-  border: none;
-  transition: background 0.2s ease-in-out, color 0.2s ease-in-out;
-
-  svg {
-    transition: fill 0.2s ease-in-out;
-    fill: ${(props) => {
-      switch (props.variant) {
-        case 'default':
-          return 'var(--btn-default-fg)';
-        case 'filled':
-          return 'var(--btn-primary-fg)';
-        case 'subtle':
-          return 'var(--btn-subtle-fg)';
-        default:
-          return '';
-      }
-    }};
-  }
-
-  &:disabled {
-    color: ${(props) => {
-      switch (props.variant) {
-        case 'default':
-          return 'var(--btn-default-fg)';
-        case 'filled':
-          return 'var(--btn-primary-fg)';
-        case 'subtle':
-          return 'var(--btn-subtle-fg)';
-        default:
-          return '';
-      }
-    }};
-    background: ${(props) => {
-      switch (props.variant) {
-        case 'default':
-          return 'var(--btn-default-bg)';
-        case 'filled':
-          return 'var(--btn-primary-bg)';
-        case 'subtle':
-          return 'var(--btn-subtle-bg)';
-        default:
-          return '';
-      }
-    }};
-
-    opacity: 0.6;
-  }
-
-  &:hover {
-    color: ${(props) => {
-      switch (props.variant) {
-        case 'default':
-          return 'var(--btn-default-fg-hover)';
-        case 'filled':
-          return 'var(--btn-primary-fg-hover)';
-        case 'subtle':
-          return 'var(--btn-subtle-fg-hover)';
-        default:
-          return '';
-      }
-    }};
-    background: ${(props) => {
-      switch (props.variant) {
-        case 'default':
-          return 'var(--btn-default-bg-hover)';
-        case 'filled':
-          return 'var(--btn-primary-bg-hover)';
-        case 'subtle':
-          return 'var(--btn-subtle-bg-hover)';
-        default:
-          return '';
-      }
-    }};
-
-    svg {
-      fill: ${(props) => {
-        switch (props.variant) {
-          case 'default':
-            return 'var(--btn-default-fg-hover)';
-          case 'filled':
-            return 'var(--btn-primary-fg-hover)';
-          case 'subtle':
-            return 'var(--btn-subtle-fg-hover)';
-          default:
-            return '';
-        }
-      }};
-    }
-  }
-
-  &:focus-visible {
-    color: ${(props) => {
-      switch (props.variant) {
-        case 'default':
-          return 'var(--btn-default-fg-hover)';
-        case 'filled':
-          return 'var(--btn-primary-fg-hover)';
-        case 'subtle':
-          return 'var(--btn-subtle-fg-hover)';
-        default:
-          return '';
-      }
-    }};
-    background: ${(props) => {
-      switch (props.variant) {
-        case 'default':
-          return 'var(--btn-default-bg-hover)';
-        case 'filled':
-          return 'var(--btn-primary-bg-hover)';
-        case 'subtle':
-          return 'var(--btn-subtle-bg-hover)';
-        default:
-          return '';
-      }
-    }};
-  }
-
-  &:active {
-    transform: none;
-  }
-
-  & .mantine-Button-centerLoader {
-    display: none;
-  }
-
-  & .mantine-Button-leftIcon {
-    display: flex;
-    margin-right: 0.5rem;
-  }
-
-  .mantine-Button-rightIcon {
-    display: flex;
-    margin-left: 0.5rem;
-  }
-`;
-
-const ButtonChildWrapper = styled.span<{ $loading?: boolean }>`
-  color: ${(props) => props.$loading && 'transparent !important'};
-`;
-
-const SpinnerWrapper = styled.div`
-  position: absolute;
-  top: 50%;
-  left: 50%;
-  transform: translate3d(-50%, -50%, 0);
-`;
-
-export const _Button = forwardRef<HTMLButtonElement, ButtonProps>(
-  ({ children, tooltip, ...props }: ButtonProps, ref) => {
-    if (tooltip) {
-      return (
-        <Tooltip
-          withinPortal
-          {...tooltip}
-        >
-          <StyledButton
-            ref={ref}
-            loaderPosition="center"
-            {...props}
-          >
-            <ButtonChildWrapper $loading={props.loading}>{children}</ButtonChildWrapper>
-            {props.loading && (
-              <SpinnerWrapper>
-                <Spinner />
-              </SpinnerWrapper>
-            )}
-          </StyledButton>
-        </Tooltip>
-      );
-    }
-
-    return (
-      <StyledButton
-        ref={ref}
-        loaderPosition="center"
-        {...props}
-      >
-        <ButtonChildWrapper $loading={props.loading}>{children}</ButtonChildWrapper>
-        {props.loading && (
-          <SpinnerWrapper>
-            <Spinner />
-          </SpinnerWrapper>
-        )}
-      </StyledButton>
-    );
-  },
-);
-
-export const Button = createPolymorphicComponent<'button', ButtonProps>(_Button);
-
-_Button.defaultProps = {
-  loading: undefined,
-  onClick: undefined,
-  tooltip: undefined,
-};
-
-interface HoldButtonProps extends ButtonProps {
-  timeoutProps: {
-    callback: () => void;
-    duration: number;
-  };
-}
-
-export const TimeoutButton = ({ timeoutProps, ...props }: HoldButtonProps) => {
-  const [, setTimeoutRemaining] = useState(timeoutProps.duration);
-  const [isRunning, setIsRunning] = useState(false);
-  const intervalRef = useRef(0);
-
-  const callback = () => {
-    timeoutProps.callback();
-    setTimeoutRemaining(timeoutProps.duration);
-    clearInterval(intervalRef.current);
-    setIsRunning(false);
-  };
-
-  const { start, clear } = useTimeout(callback, timeoutProps.duration);
-
-  const startTimeout = useCallback(() => {
-    if (isRunning) {
-      clearInterval(intervalRef.current);
-      setIsRunning(false);
-      clear();
-    } else {
-      setIsRunning(true);
-      start();
-
-      const intervalId = window.setInterval(() => {
-        setTimeoutRemaining((prev) => prev - 100);
-      }, 100);
-
-      intervalRef.current = intervalId;
-    }
-  }, [clear, isRunning, start]);
-
-  return (
-    <Button
-      sx={{ color: 'var(--danger-color)' }}
-      onClick={startTimeout}
-      {...props}
-    >
-      {isRunning ? 'Cancel' : props.children}
-    </Button>
-  );
-};

src/renderer/components/card/album-card.tsx

@@ -1,313 +0,0 @@
-import React, { useCallback } from 'react';
-import { Center } from '@mantine/core';
-import { RiAlbumFill } from 'react-icons/ri';
-import { generatePath, useNavigate } from 'react-router';
-import { Link } from 'react-router-dom';
-import { SimpleImg } from 'react-simple-img';
-import styled from 'styled-components';
-import { Text } from '/@/renderer/components/text';
-import type { LibraryItem, CardRow, CardRoute, Play, PlayQueueAddOptions } from '/@/renderer/types';
-import { Skeleton } from '/@/renderer/components/skeleton';
-import { CardControls } from '/@/renderer/components/card/card-controls';
-import { Album } from '/@/renderer/api/types';
-
-const CardWrapper = styled.div<{
-  link?: boolean;
-}>`
-  padding: 1rem;
-  background: var(--card-default-bg);
-  border-radius: var(--card-default-radius);
-  cursor: ${({ link }) => link && 'pointer'};
-  transition: border 0.2s ease-in-out, background 0.2s ease-in-out;
-
-  &:hover {
-    background: var(--card-default-bg-hover);
-  }
-
-  &:hover div {
-    opacity: 1;
-  }
-
-  &:hover * {
-    &::before {
-      opacity: 0.5;
-    }
-  }
-
-  &:focus-visible {
-    outline: 1px solid #fff;
-  }
-`;
-
-const StyledCard = styled.div`
-  display: flex;
-  flex-direction: column;
-  gap: 0.5rem;
-  width: 100%;
-  height: 100%;
-  padding: 0;
-  border-radius: var(--card-default-radius);
-`;
-
-const ImageSection = styled.div`
-  position: relative;
-  display: flex;
-  justify-content: center;
-  border-radius: var(--card-default-radius);
-
-  &::before {
-    position: absolute;
-    top: 0;
-    left: 0;
-    z-index: 1;
-    width: 100%;
-    height: 100%;
-    background: linear-gradient(0deg, rgba(0, 0, 0, 100%) 35%, rgba(0, 0, 0, 0%) 100%);
-    opacity: 0;
-    transition: all 0.2s ease-in-out;
-    content: '';
-    user-select: none;
-  }
-`;
-
-const Image = styled(SimpleImg)`
-  border-radius: var(--card-default-radius);
-  box-shadow: 2px 2px 10px 2px rgba(0, 0, 0, 20%);
-`;
-
-const ControlsContainer = styled.div`
-  position: absolute;
-  bottom: 0;
-  z-index: 50;
-  width: 100%;
-  opacity: 0;
-  transition: all 0.2s ease-in-out;
-`;
-
-const DetailSection = styled.div`
-  display: flex;
-  flex-direction: column;
-`;
-
-const Row = styled.div<{ $secondary?: boolean }>`
-  width: 100%;
-  max-width: 100%;
-  height: 22px;
-  padding: 0 0.2rem;
-  overflow: hidden;
-  color: ${({ $secondary }) => ($secondary ? 'var(--main-fg-secondary)' : 'var(--main-fg)')};
-  white-space: nowrap;
-  text-overflow: ellipsis;
-  user-select: none;
-`;
-
-interface BaseGridCardProps {
-  controls: {
-    cardRows: CardRow<Album>[];
-    itemType: LibraryItem;
-    playButtonBehavior: Play;
-    route: CardRoute;
-  };
-  data: any;
-  handlePlayQueueAdd: (options: PlayQueueAddOptions) => void;
-  loading?: boolean;
-  size: number;
-}
-
-export const AlbumCard = ({
-  loading,
-  size,
-  handlePlayQueueAdd,
-  data,
-  controls,
-}: BaseGridCardProps) => {
-  const navigate = useNavigate();
-  const { itemType, cardRows, route } = controls;
-
-  const handleNavigate = useCallback(() => {
-    navigate(
-      generatePath(
-        route.route,
-        route.slugs?.reduce((acc, slug) => {
-          return {
-            ...acc,
-            [slug.slugProperty]: data[slug.idProperty],
-          };
-        }, {}),
-      ),
-    );
-  }, [data, navigate, route.route, route.slugs]);
-
-  if (!loading) {
-    return (
-      <CardWrapper
-        link
-        onClick={handleNavigate}
-      >
-        <StyledCard>
-          <ImageSection>
-            {data?.imageUrl ? (
-              <Image
-                animationDuration={0.3}
-                height={size}
-                imgStyle={{ objectFit: 'cover' }}
-                placeholder="var(--card-default-bg)"
-                src={data?.imageUrl}
-                width={size}
-              />
-            ) : (
-              <Center
-                sx={{
-                  background: 'var(--placeholder-bg)',
-                  borderRadius: 'var(--card-default-radius)',
-                  height: `${size}px`,
-                  width: `${size}px`,
-                }}
-              >
-                <RiAlbumFill
-                  color="var(--placeholder-fg)"
-                  size={35}
-                />
-              </Center>
-            )}
-            <ControlsContainer>
-              <CardControls
-                handlePlayQueueAdd={handlePlayQueueAdd}
-                itemData={data}
-                itemType={itemType}
-              />
-            </ControlsContainer>
-          </ImageSection>
-          <DetailSection>
-            {cardRows.map((row: CardRow<Album>, index: number) => {
-              if (row.arrayProperty && row.route) {
-                return (
-                  <Row
-                    key={`row-${row.property}-${index}`}
-                    $secondary={index > 0}
-                  >
-                    {data[row.property].map((item: any, itemIndex: number) => (
-                      <React.Fragment key={`${data.id}-${item.id}`}>
-                        {itemIndex > 0 && (
-                          <Text
-                            $noSelect
-                            sx={{
-                              display: 'inline-block',
-                              padding: '0 2px 0 1px',
-                            }}
-                          >
-                            ,
-                          </Text>
-                        )}{' '}
-                        <Text
-                          $link
-                          $noSelect
-                          $secondary={index > 0}
-                          component={Link}
-                          overflow="hidden"
-                          size={index > 0 ? 'xs' : 'md'}
-                          to={generatePath(
-                            row.route!.route,
-                            row.route!.slugs?.reduce((acc, slug) => {
-                              return {
-                                ...acc,
-                                [slug.slugProperty]: data[slug.idProperty],
-                              };
-                            }, {}),
-                          )}
-                          onClick={(e) => e.stopPropagation()}
-                        >
-                          {row.arrayProperty && item[row.arrayProperty]}
-                        </Text>
-                      </React.Fragment>
-                    ))}
-                  </Row>
-                );
-              }
-
-              if (row.arrayProperty) {
-                return (
-                  <Row key={`row-${row.property}`}>
-                    {data[row.property].map((item: any) => (
-                      <Text
-                        key={`${data.id}-${item.id}`}
-                        $noSelect
-                        $secondary={index > 0}
-                        overflow="hidden"
-                        size={index > 0 ? 'xs' : 'md'}
-                      >
-                        {row.arrayProperty && item[row.arrayProperty]}
-                      </Text>
-                    ))}
-                  </Row>
-                );
-              }
-
-              return (
-                <Row key={`row-${row.property}`}>
-                  {row.route ? (
-                    <Text
-                      $link
-                      $noSelect
-                      component={Link}
-                      overflow="hidden"
-                      to={generatePath(
-                        row.route.route,
-                        row.route.slugs?.reduce((acc, slug) => {
-                          return {
-                            ...acc,
-                            [slug.slugProperty]: data[slug.idProperty],
-                          };
-                        }, {}),
-                      )}
-                      onClick={(e) => e.stopPropagation()}
-                    >
-                      {data && data[row.property]}
-                    </Text>
-                  ) : (
-                    <Text
-                      $noSelect
-                      $secondary={index > 0}
-                      overflow="hidden"
-                      size={index > 0 ? 'xs' : 'md'}
-                    >
-                      {data && data[row.property]}
-                    </Text>
-                  )}
-                </Row>
-              );
-            })}
-          </DetailSection>
-        </StyledCard>
-      </CardWrapper>
-    );
-  }
-
-  return (
-    <CardWrapper>
-      <StyledCard style={{ alignItems: 'center', display: 'flex' }}>
-        <Skeleton
-          visible
-          height={size}
-          radius="sm"
-          width={size}
-        >
-          <ImageSection />
-        </Skeleton>
-        <DetailSection style={{ width: '100%' }}>
-          {cardRows.map((_row: CardRow<Album>, index: number) => (
-            <Skeleton
-              visible
-              height={15}
-              my={3}
-              radius="md"
-              width={!data ? (index > 0 ? '50%' : '90%') : '100%'}
-            >
-              <Row />
-            </Skeleton>
-          ))}
-        </DetailSection>
-      </StyledCard>
-    </CardWrapper>
-  );
-};

src/renderer/components/card/card-controls.tsx

@@ -1,200 +0,0 @@
-import type { MouseEvent } from 'react';
-import React from 'react';
-import type { UnstyledButtonProps } from '@mantine/core';
-import { Group } from '@mantine/core';
-import { RiPlayFill, RiMore2Fill, RiHeartFill, RiHeartLine } from 'react-icons/ri';
-import styled from 'styled-components';
-import { _Button } from '/@/renderer/components/button';
-import { DropdownMenu } from '/@/renderer/components/dropdown-menu';
-import type { LibraryItem, PlayQueueAddOptions } from '/@/renderer/types';
-import { Play } from '/@/renderer/types';
-import { useSettingsStore } from '/@/renderer/store/settings.store';
-
-type PlayButtonType = UnstyledButtonProps & React.ComponentPropsWithoutRef<'button'>;
-
-const PlayButton = styled.button<PlayButtonType>`
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  width: 50px;
-  height: 50px;
-  background-color: rgb(255, 255, 255);
-  border: none;
-  border-radius: 50%;
-  opacity: 0.8;
-  transition: opacity 0.2s ease-in-out;
-  transition: scale 0.2s linear;
-
-  &:hover {
-    opacity: 1;
-    scale: 1.1;
-  }
-
-  &:active {
-    opacity: 1;
-    scale: 1;
-  }
-
-  svg {
-    fill: rgb(0, 0, 0);
-    stroke: rgb(0, 0, 0);
-  }
-`;
-
-const SecondaryButton = styled(_Button)`
-  opacity: 0.8;
-  transition: opacity 0.2s ease-in-out;
-  transition: scale 0.2s linear;
-
-  &:hover {
-    opacity: 1;
-    scale: 1.1;
-  }
-
-  &:active {
-    opacity: 1;
-    scale: 1;
-  }
-`;
-
-const GridCardControlsContainer = styled.div`
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  width: 100%;
-  height: 100%;
-`;
-
-const ControlsRow = styled.div`
-  width: 100%;
-  height: calc(100% / 3);
-`;
-
-// const TopControls = styled(ControlsRow)`
-//   display: flex;
-//   align-items: flex-start;
-//   justify-content: space-between;
-//   padding: 0.5rem;
-// `;
-
-// const CenterControls = styled(ControlsRow)`
-//   display: flex;
-//   align-items: center;
-//   justify-content: center;
-//   padding: 0.5rem;
-// `;
-
-const BottomControls = styled(ControlsRow)`
-  display: flex;
-  align-items: flex-end;
-  justify-content: space-between;
-  padding: 1rem 0.5rem;
-`;
-
-const FavoriteWrapper = styled.span<{ isFavorite: boolean }>`
-  svg {
-    fill: ${(props) => props.isFavorite && 'var(--primary-color)'};
-  }
-`;
-
-const PLAY_TYPES = [
-  {
-    label: 'Play',
-    play: Play.NOW,
-  },
-  {
-    label: 'Add to queue (last)',
-    play: Play.LAST,
-  },
-  {
-    label: 'Add to queue (next)',
-    play: Play.NEXT,
-  },
-];
-
-export const CardControls = ({
-  itemData,
-  itemType,
-  handlePlayQueueAdd,
-}: {
-  handlePlayQueueAdd: (options: PlayQueueAddOptions) => void;
-  itemData: any;
-  itemType: LibraryItem;
-}) => {
-  const playButtonBehavior = useSettingsStore((state) => state.player.playButtonBehavior);
-
-  const handlePlay = (e: MouseEvent<HTMLButtonElement>, playType?: Play) => {
-    e.preventDefault();
-    e.stopPropagation();
-    handlePlayQueueAdd({
-      byItemType: {
-        id: itemData.id,
-        type: itemType,
-      },
-      play: playType || playButtonBehavior,
-    });
-  };
-
-  return (
-    <GridCardControlsContainer>
-      <BottomControls>
-        <PlayButton onClick={handlePlay}>
-          <RiPlayFill size={25} />
-        </PlayButton>
-        <Group spacing="xs">
-          <SecondaryButton
-            disabled
-            p={5}
-            sx={{ svg: { fill: 'white !important' } }}
-            variant="subtle"
-          >
-            <FavoriteWrapper isFavorite={itemData?.isFavorite}>
-              {itemData?.isFavorite ? (
-                <RiHeartFill size={20} />
-              ) : (
-                <RiHeartLine
-                  color="white"
-                  size={20}
-                />
-              )}
-            </FavoriteWrapper>
-          </SecondaryButton>
-          <DropdownMenu
-            withinPortal
-            position="bottom-start"
-          >
-            <DropdownMenu.Target>
-              <SecondaryButton
-                p={5}
-                sx={{ svg: { fill: 'white !important' } }}
-                variant="subtle"
-                onClick={(e) => {
-                  e.preventDefault();
-                  e.stopPropagation();
-                }}
-              >
-                <RiMore2Fill
-                  color="white"
-                  size={20}
-                />
-              </SecondaryButton>
-            </DropdownMenu.Target>
-            <DropdownMenu.Dropdown>
-              {PLAY_TYPES.filter((type) => type.play !== playButtonBehavior).map((type) => (
-                <DropdownMenu.Item
-                  key={`playtype-${type.play}`}
-                  onClick={(e: MouseEvent<HTMLButtonElement>) => handlePlay(e, type.play)}
-                >
-                  {type.label}
-                </DropdownMenu.Item>
-              ))}
-              <DropdownMenu.Item disabled>Add to playlist</DropdownMenu.Item>
-              <DropdownMenu.Item disabled>Refresh metadata</DropdownMenu.Item>
-            </DropdownMenu.Dropdown>
-          </DropdownMenu>
-        </Group>
-      </BottomControls>
-    </GridCardControlsContainer>
-  );
-};

src/renderer/components/card/card-rows.tsx

@@ -1,180 +0,0 @@
-import React from 'react';
-import { generatePath } from 'react-router';
-import { Link } from 'react-router-dom';
-import styled from 'styled-components';
-import { Album, AlbumArtist, Artist } from '/@/renderer/api/types';
-import { Text } from '/@/renderer/components/text';
-import { AppRoute } from '/@/renderer/router/routes';
-import { CardRow } from '/@/renderer/types';
-
-const Row = styled.div<{ $secondary?: boolean }>`
-  width: 100%;
-  max-width: 100%;
-  height: 22px;
-  padding: 0 0.2rem;
-  overflow: hidden;
-  color: ${({ $secondary }) => ($secondary ? 'var(--main-fg-secondary)' : 'var(--main-fg)')};
-  white-space: nowrap;
-  text-overflow: ellipsis;
-  user-select: none;
-`;
-
-interface CardRowsProps {
-  data: any;
-  rows: CardRow<Album | Artist | AlbumArtist>[];
-}
-
-export const CardRows = ({ data, rows }: CardRowsProps) => {
-  return (
-    <>
-      {rows.map((row, index: number) => {
-        if (row.arrayProperty && row.route) {
-          return (
-            <Row
-              key={`row-${row.property}-${index}`}
-              $secondary={index > 0}
-            >
-              {data[row.property].map((item: any, itemIndex: number) => (
-                <React.Fragment key={`${data.id}-${item.id}`}>
-                  {itemIndex > 0 && (
-                    <Text
-                      $noSelect
-                      sx={{
-                        display: 'inline-block',
-                        padding: '0 2px 0 1px',
-                      }}
-                    >
-                      ,
-                    </Text>
-                  )}{' '}
-                  <Text
-                    $link
-                    $noSelect
-                    $secondary={index > 0}
-                    component={Link}
-                    overflow="hidden"
-                    size={index > 0 ? 'sm' : 'md'}
-                    to={generatePath(
-                      row.route!.route,
-                      row.route!.slugs?.reduce((acc, slug) => {
-                        return {
-                          ...acc,
-                          [slug.slugProperty]: data[slug.idProperty],
-                        };
-                      }, {}),
-                    )}
-                    onClick={(e) => e.stopPropagation()}
-                  >
-                    {row.arrayProperty && item[row.arrayProperty]}
-                  </Text>
-                </React.Fragment>
-              ))}
-            </Row>
-          );
-        }
-
-        if (row.arrayProperty) {
-          return (
-            <Row key={`row-${row.property}`}>
-              {data[row.property].map((item: any) => (
-                <Text
-                  key={`${data.id}-${item.id}`}
-                  $noSelect
-                  $secondary={index > 0}
-                  overflow="hidden"
-                  size={index > 0 ? 'sm' : 'md'}
-                >
-                  {row.arrayProperty && item[row.arrayProperty]}
-                </Text>
-              ))}
-            </Row>
-          );
-        }
-
-        return (
-          <Row key={`row-${row.property}`}>
-            {row.route ? (
-              <Text
-                $link
-                $noSelect
-                component={Link}
-                overflow="hidden"
-                to={generatePath(
-                  row.route.route,
-                  row.route.slugs?.reduce((acc, slug) => {
-                    return {
-                      ...acc,
-                      [slug.slugProperty]: data[slug.idProperty],
-                    };
-                  }, {}),
-                )}
-                onClick={(e) => e.stopPropagation()}
-              >
-                {data && data[row.property]}
-              </Text>
-            ) : (
-              <Text
-                $noSelect
-                $secondary={index > 0}
-                overflow="hidden"
-                size={index > 0 ? 'sm' : 'md'}
-              >
-                {data && data[row.property]}
-              </Text>
-            )}
-          </Row>
-        );
-      })}
-    </>
-  );
-};
-
-export const ALBUM_CARD_ROWS: { [key: string]: CardRow<Album> } = {
-  albumArtists: {
-    arrayProperty: 'name',
-    property: 'albumArtists',
-    route: {
-      route: AppRoute.LIBRARY_ALBUMARTISTS_DETAIL,
-      slugs: [{ idProperty: 'id', slugProperty: 'albumArtistId' }],
-    },
-  },
-  artists: {
-    arrayProperty: 'name',
-    property: 'artists',
-    route: {
-      route: AppRoute.LIBRARY_ALBUMARTISTS_DETAIL,
-      slugs: [{ idProperty: 'id', slugProperty: 'albumArtistId' }],
-    },
-  },
-  createdAt: {
-    property: 'createdAt',
-  },
-  duration: {
-    property: 'duration',
-  },
-  lastPlayedAt: {
-    property: 'lastPlayedAt',
-  },
-  name: {
-    property: 'name',
-    route: {
-      route: AppRoute.LIBRARY_ALBUMS_DETAIL,
-      slugs: [{ idProperty: 'id', slugProperty: 'albumId' }],
-    },
-  },
-  playCount: {
-    property: 'playCount',
-  },
-  rating: {
-    property: 'rating',
-  },
-  releaseDate: {
-    property: 'releaseDate',
-  },
-  releaseYear: {
-    property: 'releaseYear',
-  },
-  songCount: {
-    property: 'songCount',
-  },
-};

src/renderer/components/card/index.tsx

@@ -1,2 +0,0 @@
-export * from './album-card';
-export * from './card-rows';

src/renderer/components/context-menu/index.tsx

@@ -1,58 +0,0 @@
-import { forwardRef, ReactNode, Ref } from 'react';
-import { Portal } from '@mantine/core';
-import { motion } from 'framer-motion';
-import styled from 'styled-components';
-import { _Button } from '/@/renderer/components/button';
-
-interface ContextMenuProps {
-  children: ReactNode;
-  maxWidth?: number;
-  minWidth?: number;
-  xPos: number;
-  yPos: number;
-}
-
-const ContextMenuContainer = styled(motion.div)<Omit<ContextMenuProps, 'children'>>`
-  position: absolute;
-  top: ${({ yPos }) => yPos}px !important;
-  left: ${({ xPos }) => xPos}px !important;
-  z-index: 1000;
-  min-width: ${({ minWidth }) => minWidth}px;
-  max-width: ${({ maxWidth }) => maxWidth}px;
-  padding: 0.5rem;
-  background: var(--dropdown-menu-bg);
-  border-radius: 5px;
-  box-shadow: 2px 2px 10px 2px rgba(0, 0, 0, 40%);
-`;
-
-export const ContextMenuButton = styled(_Button)`
-  padding: 0.5rem;
-  background: var(--dropdown-menu-bg);
-  cursor: default;
-
-  & .mantine-Button-inner {
-    justify-content: flex-start;
-  }
-
-  &:disabled {
-    background: transparent;
-  }
-`;
-
-export const ContextMenu = forwardRef(
-  ({ yPos, xPos, minWidth, maxWidth, children }: ContextMenuProps, ref: Ref<HTMLDivElement>) => {
-    return (
-      <Portal>
-        <ContextMenuContainer
-          ref={ref}
-          maxWidth={maxWidth}
-          minWidth={minWidth}
-          xPos={xPos}
-          yPos={yPos}
-        >
-          {children}
-        </ContextMenuContainer>
-      </Portal>
-    );
-  },
-);

src/renderer/components/date-picker/index.tsx

@@ -1,50 +0,0 @@
-import type { DatePickerProps as MantineDatePickerProps } from '@mantine/dates';
-import { DatePicker as MantineDatePicker } from '@mantine/dates';
-import styled from 'styled-components';
-
-interface DatePickerProps extends MantineDatePickerProps {
-  maxWidth?: number | string;
-  width?: number | string;
-}
-
-const StyledDatePicker = styled(MantineDatePicker)<DatePickerProps>`
-  & .mantine-DatePicker-input {
-    color: var(--input-fg);
-    background: var(--input-bg);
-
-    &::placeholder {
-      color: var(--input-placeholder-fg);
-    }
-  }
-
-  & .mantine-DatePicker-icon {
-    color: var(--input-placeholder-fg);
-  }
-
-  & .mantine-DatePicker-required {
-    color: var(--secondary-color);
-  }
-
-  & .mantine-DatePicker-label {
-    font-family: var(--label-font-faimly);
-  }
-
-  & .mantine-DateRangePicker-disabled {
-    opacity: 0.6;
-  }
-`;
-
-export const DatePicker = ({ width, maxWidth, ...props }: DatePickerProps) => {
-  return (
-    <StyledDatePicker
-      withinPortal
-      {...props}
-      sx={{ maxWidth, width }}
-    />
-  );
-};
-
-DatePicker.defaultProps = {
-  maxWidth: undefined,
-  width: undefined,
-};

src/renderer/components/dropdown-menu/index.tsx

@@ -1,119 +0,0 @@
-import type {
-  MenuProps as MantineMenuProps,
-  MenuItemProps as MantineMenuItemProps,
-  MenuLabelProps as MantineMenuLabelProps,
-  MenuDividerProps as MantineMenuDividerProps,
-  MenuDropdownProps as MantineMenuDropdownProps,
-} from '@mantine/core';
-import { Menu as MantineMenu, createPolymorphicComponent } from '@mantine/core';
-import { RiArrowLeftSFill } from 'react-icons/ri';
-import styled from 'styled-components';
-
-type MenuProps = MantineMenuProps;
-type MenuLabelProps = MantineMenuLabelProps;
-interface MenuItemProps extends MantineMenuItemProps {
-  $isActive?: boolean;
-  children: React.ReactNode;
-}
-type MenuDividerProps = MantineMenuDividerProps;
-type MenuDropdownProps = MantineMenuDropdownProps;
-
-const StyledMenu = styled(MantineMenu)<MenuProps>``;
-
-const StyledMenuLabel = styled(MantineMenu.Label)<MenuLabelProps>`
-  font-family: var(--content-font-family);
-`;
-
-const StyledMenuItem = styled(MantineMenu.Item)<MenuItemProps>`
-  padding: 0.8rem;
-  font-size: 0.9em;
-  font-family: var(--content-font-family);
-  background-color: ${({ $isActive }) => {
-    if (!$isActive) return undefined;
-    return 'var(--dropdown-menu-bg-hover)';
-  }};
-
-  &:disabled {
-    opacity: 0.6;
-  }
-
-  &:hover {
-    background-color: var(--dropdown-menu-bg-hover);
-  }
-
-  & .mantine-Menu-itemIcon {
-    margin-right: 0.5rem;
-  }
-
-  & .mantine-Menu-itemLabel {
-    color: var(--dropdown-menu-fg);
-    font-weight: 500;
-    font-size: 1em;
-  }
-
-  & .mantine-Menu-itemRightSection {
-    display: flex;
-    margin-left: 2rem !important;
-  }
-`;
-
-const StyledMenuDropdown = styled(MantineMenu.Dropdown)`
-  background: var(--dropdown-menu-bg);
-  border: var(--dropdown-menu-border);
-  border-radius: var(--dropdown-menu-border-radius);
-  filter: drop-shadow(0 0 5px rgb(0, 0, 0, 50%));
-`;
-
-const StyledMenuDivider = styled(MantineMenu.Divider)`
-  margin: 0.3rem 0;
-`;
-
-export const DropdownMenu = ({ children, ...props }: MenuProps) => {
-  return (
-    <StyledMenu
-      withinPortal
-      radius="sm"
-      styles={{
-        dropdown: {
-          filter: 'drop-shadow(0 0 5px rgb(0, 0, 0, 50%))',
-        },
-      }}
-      transition="scale-y"
-      {...props}
-    >
-      {children}
-    </StyledMenu>
-  );
-};
-
-const MenuLabel = ({ children, ...props }: MenuLabelProps) => {
-  return <StyledMenuLabel {...props}>{children}</StyledMenuLabel>;
-};
-
-const pMenuItem = ({ $isActive, children, ...props }: MenuItemProps) => {
-  return (
-    <StyledMenuItem
-      $isActive={$isActive}
-      rightSection={$isActive && <RiArrowLeftSFill size={20} />}
-      {...props}
-    >
-      {children}
-    </StyledMenuItem>
-  );
-};
-
-const MenuDropdown = ({ children, ...props }: MenuDropdownProps) => {
-  return <StyledMenuDropdown {...props}>{children}</StyledMenuDropdown>;
-};
-
-const MenuItem = createPolymorphicComponent<'button', MenuItemProps>(pMenuItem);
-
-const MenuDivider = ({ ...props }: MenuDividerProps) => {
-  return <StyledMenuDivider {...props} />;
-};
-
-DropdownMenu.Label = MenuLabel;
-DropdownMenu.Item = MenuItem;
-DropdownMenu.Target = MantineMenu.Target;
-DropdownMenu.Dropdown = MenuDropdown;
-DropdownMenu.Divider = MenuDivider;

src/renderer/components/dropzone/index.tsx

@@ -1,33 +0,0 @@
-import type { DropzoneProps as MantineDropzoneProps } from '@mantine/dropzone';
-import { Dropzone as MantineDropzone } from '@mantine/dropzone';
-import styled from 'styled-components';
-
-export type DropzoneProps = MantineDropzoneProps;
-
-const StyledDropzone = styled(MantineDropzone)`
-  display: flex;
-  justify-content: center;
-  width: 100%;
-  height: 100%;
-  background: var(--input-bg);
-  border-radius: 5px;
-  opacity: 0.8;
-  transition: opacity 0.2s ease;
-
-  &:hover {
-    background: var(--input-bg);
-    opacity: 1;
-  }
-
-  & .mantine-Dropzone-inner {
-    display: flex;
-  }
-`;
-
-export const Dropzone = ({ children, ...props }: DropzoneProps) => {
-  return <StyledDropzone {...props}>{children}</StyledDropzone>;
-};
-
-Dropzone.Accept = StyledDropzone.Accept;
-Dropzone.Idle = StyledDropzone.Idle;
-Dropzone.Reject = StyledDropzone.Reject;

src/renderer/components/feature-carousel/index.tsx

@@ -1,213 +0,0 @@
-import type { MouseEvent } from 'react';
-import { useState } from 'react';
-import { Group, Image, Stack } from '@mantine/core';
-import type { Variants } from 'framer-motion';
-import { AnimatePresence, motion } from 'framer-motion';
-import { RiArrowLeftSLine, RiArrowRightSLine } from 'react-icons/ri';
-import { Link, generatePath } from 'react-router-dom';
-import styled from 'styled-components';
-import type { Album } from '/@/renderer/api/types';
-import { Button } from '/@/renderer/components/button';
-import { TextTitle } from '/@/renderer/components/text-title';
-import { Badge } from '/@/renderer/components/badge';
-import { AppRoute } from '/@/renderer/router/routes';
-
-const Carousel = styled(motion.div)`
-  position: relative;
-  height: 30vh;
-  min-height: 250px;
-
-  padding: 2rem;
-  overflow: hidden;
-  background: linear-gradient(180deg, var(--main-bg), rgba(25, 26, 28, 60%));
-`;
-
-const Grid = styled.div`
-  display: grid;
-  grid-auto-columns: 1fr;
-  grid-template-areas: 'image info';
-  grid-template-rows: 1fr;
-  grid-template-columns: 225px 1fr;
-  gap: 0.5rem;
-  width: 100%;
-  max-width: 100%;
-  height: 100%;
-`;
-
-const ImageColumn = styled.div`
-  z-index: 15;
-  display: flex;
-  grid-area: image;
-  align-items: flex-end;
-`;
-
-const InfoColumn = styled.div`
-  z-index: 15;
-  display: flex;
-  grid-area: info;
-  align-items: flex-end;
-  width: 100%;
-  padding-left: 1rem;
-`;
-
-const BackgroundImage = styled.img`
-  position: absolute;
-  top: 0;
-  left: 0;
-  z-index: 0;
-  width: 150%;
-  height: 150%;
-  object-fit: cover;
-  object-position: 0 30%;
-  filter: blur(24px);
-  user-select: none;
-`;
-
-const BackgroundImageOverlay = styled.div`
-  position: absolute;
-  top: 0;
-  left: 0;
-  z-index: 10;
-  width: 100%;
-  height: 100%;
-  background: linear-gradient(180deg, rgba(25, 26, 28, 30%), var(--main-bg));
-`;
-
-const Wrapper = styled(Link)`
-  position: relative;
-  width: 100%;
-  height: 100%;
-  overflow: hidden;
-`;
-
-const TitleWrapper = styled.div`
-  /* stylelint-disable-next-line value-no-vendor-prefix */
-  display: -webkit-box;
-  -webkit-line-clamp: 2;
-  -webkit-box-orient: vertical;
-  overflow: hidden;
-`;
-
-const variants: Variants = {
-  animate: {
-    opacity: 1,
-    transition: { opacity: { duration: 0.5 } },
-  },
-  exit: {
-    opacity: 0,
-    transition: { opacity: { duration: 0.5 } },
-  },
-  initial: {
-    opacity: 0,
-  },
-};
-
-interface FeatureCarouselProps {
-  data: Album[] | undefined;
-}
-
-export const FeatureCarousel = ({ data }: FeatureCarouselProps) => {
-  const [itemIndex, setItemIndex] = useState(0);
-  const [direction, setDirection] = useState(0);
-
-  const currentItem = data?.[itemIndex];
-
-  const handleNext = (e: MouseEvent<HTMLButtonElement>) => {
-    e.preventDefault();
-    setDirection(1);
-    setItemIndex((prev) => prev + 1);
-  };
-
-  const handlePrevious = (e: MouseEvent<HTMLButtonElement>) => {
-    e.preventDefault();
-    setDirection(-1);
-    setItemIndex((prev) => prev - 1);
-  };
-
-  return (
-    <Wrapper to={generatePath(AppRoute.LIBRARY_ALBUMS_DETAIL, { albumId: currentItem?.id || '' })}>
-      <AnimatePresence
-        custom={direction}
-        initial={false}
-        mode="popLayout"
-      >
-        {data && (
-          <Carousel
-            key={`image-${itemIndex}`}
-            animate="animate"
-            custom={direction}
-            exit="exit"
-            initial="initial"
-            variants={variants}
-          >
-            <Grid>
-              <ImageColumn>
-                <Image
-                  height={225}
-                  placeholder="var(--card-default-bg)"
-                  radius="sm"
-                  src={data[itemIndex]?.imageUrl}
-                  sx={{ objectFit: 'cover' }}
-                  width={225}
-                />
-              </ImageColumn>
-              <InfoColumn>
-                <Stack sx={{ width: '100%' }}>
-                  <TitleWrapper>
-                    <TextTitle fw="bold">{currentItem?.name}</TextTitle>
-                  </TitleWrapper>
-                  <TitleWrapper>
-                    {currentItem?.albumArtists.map((artist) => (
-                      <TextTitle
-                        key={`carousel-artist-${artist.id}`}
-                        fw="600"
-                        order={3}
-                      >
-                        {artist.name}
-                      </TextTitle>
-                    ))}
-                  </TitleWrapper>
-                  <Group>
-                    {currentItem?.genres?.map((genre) => (
-                      <Badge key={`carousel-genre-${genre.id}`}>{genre.name}</Badge>
-                    ))}
-                    <Badge>{currentItem?.releaseYear}</Badge>
-                    <Badge>{currentItem?.songCount} tracks</Badge>
-                  </Group>
-                </Stack>
-              </InfoColumn>
-            </Grid>
-            <BackgroundImage
-              draggable="false"
-              src={currentItem?.imageUrl || undefined}
-            />
-            <BackgroundImageOverlay />
-          </Carousel>
-        )}
-      </AnimatePresence>
-      <Group
-        spacing="xs"
-        sx={{ bottom: 0, position: 'absolute', right: 0, zIndex: 20 }}
-      >
-        <Button
-          disabled={itemIndex === 0}
-          px="lg"
-          radius={100}
-          variant="subtle"
-          onClick={handlePrevious}
-        >
-          <RiArrowLeftSLine size={15} />
-        </Button>
-        <Button
-          disabled={itemIndex === (data?.length || 1) - 1}
-          px="lg"
-          radius={100}
-          variant="subtle"
-          onClick={handleNext}
-        >
-          <RiArrowRightSLine size={15} />
-        </Button>
-      </Group>
-    </Wrapper>
-  );
-};

src/renderer/components/grid-carousel/index.tsx

@@ -1,215 +0,0 @@
-import { createContext, useContext, useState, useCallback, useMemo } from 'react';
-import { Group, Stack } from '@mantine/core';
-import type { Variants } from 'framer-motion';
-import { AnimatePresence, motion } from 'framer-motion';
-import { RiArrowLeftSLine, RiArrowRightSLine } from 'react-icons/ri';
-import { Button } from '/@/renderer/components/button';
-import { AppRoute } from '/@/renderer/router/routes';
-import type { CardRow } from '/@/renderer/types';
-import { LibraryItem, Play } from '/@/renderer/types';
-import styled from 'styled-components';
-import { AlbumCard } from '/@/renderer/components/card';
-import { useHandlePlayQueueAdd } from '/@/renderer/features/player/hooks/use-handle-playqueue-add';
-
-interface GridCarouselProps {
-  cardRows: CardRow<any>[];
-  children: React.ReactElement;
-  containerWidth: number;
-  data: any[] | undefined;
-  loading?: boolean;
-  pagination?: {
-    handleNextPage?: () => void;
-    handlePreviousPage?: () => void;
-    hasNextPage?: boolean;
-    hasPreviousPage?: boolean;
-    itemsPerPage?: number;
-  };
-  uniqueId: string;
-}
-
-const GridCarouselContext = createContext<any>({});
-
-const GridContainer = styled(motion.div)<{ height: number; itemsPerPage: number }>`
-  display: grid;
-  grid-auto-rows: 0;
-  grid-gap: 18px;
-  grid-template-rows: 1fr;
-  grid-template-columns: repeat(${(props) => props.itemsPerPage || 4}, minmax(0, 1fr));
-  height: ${(props) => props.height}px;
-  overflow: hidden;
-`;
-
-const Wrapper = styled.div`
-  position: relative;
-  width: 100%;
-  height: 100%;
-  overflow: hidden;
-`;
-
-const variants: Variants = {
-  animate: (custom: { direction: number; loading: boolean }) => {
-    return {
-      opacity: custom.loading ? 0.5 : 1,
-      scale: custom.loading ? 0.95 : 1,
-      transition: {
-        opacity: { duration: 0.2 },
-        x: { damping: 30, stiffness: 300, type: 'spring' },
-      },
-      x: 0,
-    };
-  },
-  exit: (custom: { direction: number; loading: boolean }) => {
-    return {
-      opacity: 0,
-      transition: {
-        opacity: { duration: 0.2 },
-        x: { damping: 30, stiffness: 300, type: 'spring' },
-      },
-      x: custom.direction > 0 ? -1000 : 1000,
-    };
-  },
-  initial: (custom: { direction: number; loading: boolean }) => {
-    return {
-      opacity: 0,
-      x: custom.direction > 0 ? 1000 : -1000,
-    };
-  },
-};
-
-const Carousel = ({ data, cardRows }: any) => {
-  const { loading, pagination, gridHeight, imageSize, direction, uniqueId } =
-    useContext(GridCarouselContext);
-
-  const handlePlayQueueAdd = useHandlePlayQueueAdd();
-
-  return (
-    <Wrapper>
-      <AnimatePresence
-        custom={{ direction, loading }}
-        initial={false}
-        mode="popLayout"
-      >
-        <GridContainer
-          key={`carousel-${uniqueId}-${data[0]?.id}`}
-          animate="animate"
-          custom={{ direction, loading }}
-          exit="exit"
-          height={gridHeight}
-          initial="initial"
-          itemsPerPage={pagination.itemsPerPage}
-          variants={variants}
-        >
-          {data?.map((item: any, index: number) => (
-            <AlbumCard
-              key={`card-${uniqueId}-${index}`}
-              controls={{
-                cardRows,
-                itemType: LibraryItem.ALBUM,
-                playButtonBehavior: Play.NOW,
-                route: {
-                  route: AppRoute.LIBRARY_ALBUMS_DETAIL,
-                  slugs: [{ idProperty: 'id', slugProperty: 'albumId' }],
-                },
-              }}
-              data={item}
-              handlePlayQueueAdd={handlePlayQueueAdd}
-              size={imageSize}
-            />
-          ))}
-        </GridContainer>
-      </AnimatePresence>
-    </Wrapper>
-  );
-};
-
-export const GridCarousel = ({
-  data,
-  loading,
-  cardRows,
-  pagination,
-  children,
-  containerWidth,
-  uniqueId,
-}: GridCarouselProps) => {
-  const [direction, setDirection] = useState(0);
-
-  const gridHeight = useMemo(
-    () => (containerWidth * 1.2 - 36) / (pagination?.itemsPerPage || 4),
-    [containerWidth, pagination?.itemsPerPage],
-  );
-
-  const imageSize = useMemo(() => gridHeight * 0.66, [gridHeight]);
-
-  const providerValue = useMemo(
-    () => ({
-      cardRows,
-      data,
-      direction,
-      gridHeight,
-      imageSize,
-      loading,
-      pagination,
-      setDirection,
-      uniqueId,
-    }),
-    [cardRows, data, direction, gridHeight, imageSize, loading, pagination, uniqueId],
-  );
-
-  return (
-    <GridCarouselContext.Provider value={providerValue}>
-      <Stack>
-        {children}
-        {data && (
-          <Carousel
-            cardRows={cardRows}
-            data={data}
-          />
-        )}
-      </Stack>
-    </GridCarouselContext.Provider>
-  );
-};
-
-interface TitleProps {
-  children?: React.ReactNode;
-}
-
-const Title = ({ children }: TitleProps) => {
-  const { pagination, setDirection } = useContext(GridCarouselContext);
-
-  const handleNextPage = useCallback(() => {
-    setDirection(1);
-    pagination?.handleNextPage?.();
-  }, [pagination, setDirection]);
-
-  const handlePreviousPage = useCallback(() => {
-    setDirection(-1);
-    pagination?.handlePreviousPage?.();
-  }, [pagination, setDirection]);
-
-  return (
-    <Group position="apart">
-      {children}
-      <Group>
-        <Button
-          compact
-          disabled={!pagination?.hasPreviousPage}
-          variant="default"
-          onClick={handlePreviousPage}
-        >
-          <RiArrowLeftSLine size={15} />
-        </Button>
-        <Button
-          compact
-          variant="default"
-          onClick={handleNextPage}
-        >
-          <RiArrowRightSLine size={15} />
-        </Button>
-      </Group>
-    </Group>
-  );
-};
-
-GridCarousel.Title = Title;
-GridCarousel.Carousel = Carousel;

src/renderer/components/icon-button/IconButton.tsx

@@ -0,0 +1,34 @@
+import React, { ReactNode } from 'react';
+import { ActionIcon, ActionIconProps, TooltipProps } from '@mantine/core';
+import { Tooltip } from '../tooltip/Tooltip';
+
+type MantineIconButtonProps = ActionIconProps &
+  React.ComponentPropsWithoutRef<'button'>;
+
+interface IconButtonProps extends MantineIconButtonProps {
+  active?: boolean;
+  icon: ReactNode;
+  tooltip?: Omit<TooltipProps, 'children'>;
+}
+
+export const IconButton = ({
+  active,
+  tooltip,
+  icon,
+  ...rest
+}: IconButtonProps) => {
+  if (tooltip) {
+    return (
+      <Tooltip {...tooltip}>
+        <ActionIcon {...rest}>{icon}</ActionIcon>
+      </Tooltip>
+    );
+  }
+
+  return <ActionIcon {...rest}>{icon}</ActionIcon>;
+};
+
+IconButton.defaultProps = {
+  active: false,
+  tooltip: undefined,
+};

src/renderer/components/index.ts

@@ -1,33 +1,4 @@
-export * from './accordion';
-export * from './audio-player';
-export * from './badge';
-export * from './button';
-export * from './card';
-export * from './date-picker';
-export * from './dropdown-menu';
-export * from './dropzone';
-export * from './feature-carousel';
-export * from './grid-carousel';
-export * from './input';
-export * from './modal';
-export * from './page-header';
-export * from './pagination';
-export * from './paper';
-export * from './popover';
-export * from './scroll-area';
-export * from './search-input';
-export * from './segmented-control';
-export * from './select';
-export * from './skeleton';
-export * from './slider';
-export * from './spinner';
-export * from './switch';
-export * from './tabs';
-export * from './text';
-export * from './text-title';
-export * from './toast';
-export * from './tooltip';
-export * from './virtual-grid';
-export * from './virtual-table';
-export * from './motion';
-export * from './context-menu';
+export * from './tooltip/Tooltip';
+export * from './audio-player/AudioPlayer';
+export * from './icon-button/IconButton';
+export * from './text/Text';

src/renderer/components/input/index.tsx

@@ -1,374 +0,0 @@
-import React, { forwardRef } from 'react';
-import type {
-  TextInputProps as MantineTextInputProps,
-  NumberInputProps as MantineNumberInputProps,
-  PasswordInputProps as MantinePasswordInputProps,
-  FileInputProps as MantineFileInputProps,
-  JsonInputProps as MantineJsonInputProps,
-  TextareaProps as MantineTextareaProps,
-} from '@mantine/core';
-import {
-  TextInput as MantineTextInput,
-  NumberInput as MantineNumberInput,
-  PasswordInput as MantinePasswordInput,
-  FileInput as MantineFileInput,
-  JsonInput as MantineJsonInput,
-  Textarea as MantineTextarea,
-} from '@mantine/core';
-import styled from 'styled-components';
-
-interface TextInputProps extends MantineTextInputProps {
-  children?: React.ReactNode;
-  maxWidth?: number | string;
-  width?: number | string;
-}
-
-interface NumberInputProps extends MantineNumberInputProps {
-  children?: React.ReactNode;
-  maxWidth?: number | string;
-  width?: number | string;
-}
-
-interface PasswordInputProps extends MantinePasswordInputProps {
-  children?: React.ReactNode;
-  maxWidth?: number | string;
-  width?: number | string;
-}
-
-interface FileInputProps extends MantineFileInputProps {
-  children?: React.ReactNode;
-  maxWidth?: number | string;
-  width?: number | string;
-}
-
-interface JsonInputProps extends MantineJsonInputProps {
-  children?: React.ReactNode;
-  maxWidth?: number | string;
-  width?: number | string;
-}
-
-interface TextareaProps extends MantineTextareaProps {
-  children?: React.ReactNode;
-  maxWidth?: number | string;
-  width?: number | string;
-}
-
-const StyledTextInput = styled(MantineTextInput)<TextInputProps>`
-  & .mantine-TextInput-wrapper {
-    border-color: var(--primary-color);
-  }
-
-  & .mantine-TextInput-input {
-    color: var(--input-fg);
-    background: var(--input-bg);
-
-    &::placeholder {
-      color: var(--input-placeholder-fg);
-    }
-  }
-
-  & .mantine-Input-icon {
-    color: var(--input-placeholder-fg);
-  }
-
-  & .mantine-TextInput-required {
-    color: var(--secondary-color);
-  }
-
-  & .mantine-TextInput-label {
-    font-family: var(--label-font-faimly);
-  }
-
-  & .mantine-TextInput-disabled {
-    opacity: 0.6;
-  }
-
-  transition: width 0.3s ease-in-out;
-`;
-
-const StyledNumberInput = styled(MantineNumberInput)<NumberInputProps>`
-  & .mantine-NumberInput-wrapper {
-    border-color: var(--primary-color);
-  }
-
-  & .mantine-NumberInput-input {
-    color: var(--input-fg);
-    background: var(--input-bg);
-
-    &::placeholder {
-      color: var(--input-placeholder-fg);
-    }
-  }
-
-  & .mantine-NumberInput-controlUp {
-    svg {
-      color: var(--btn-default-fg);
-      fill: var(--btn-default-fg);
-    }
-  }
-
-  & .mantine-NumberInput-controlDown {
-    svg {
-      color: var(--btn-default-fg);
-      fill: var(--btn-default-fg);
-    }
-  }
-
-  & .mantine-Input-icon {
-    color: var(--input-placeholder-fg);
-  }
-
-  & .mantine-NumberInput-required {
-    color: var(--secondary-color);
-  }
-
-  & .mantine-NumberInput-label {
-    font-family: var(--label-font-faimly);
-  }
-
-  & .mantine-NumberInput-disabled {
-    opacity: 0.6;
-  }
-
-  transition: width 0.3s ease-in-out;
-`;
-
-const StyledPasswordInput = styled(MantinePasswordInput)<PasswordInputProps>`
-  & .mantine-PasswordInput-input {
-    color: var(--input-fg);
-    background: var(--input-bg);
-
-    &::placeholder {
-      color: var(--input-placeholder-fg);
-    }
-  }
-
-  & .mantine-PasswordInput-icon {
-    color: var(--input-placeholder-fg);
-  }
-
-  & .mantine-PasswordInput-required {
-    color: var(--secondary-color);
-  }
-
-  & .mantine-PasswordInput-label {
-    font-family: var(--label-font-faimly);
-  }
-
-  & .mantine-PasswordInput-disabled {
-    opacity: 0.6;
-  }
-
-  transition: width 0.3s ease-in-out;
-`;
-
-const StyledFileInput = styled(MantineFileInput)<FileInputProps>`
-  & .mantine-FileInput-input {
-    color: var(--input-fg);
-    background: var(--input-bg);
-
-    &::placeholder {
-      color: var(--input-placeholder-fg);
-    }
-  }
-
-  & .mantine-FileInput-icon {
-    color: var(--input-placeholder-fg);
-  }
-
-  & .mantine-FileInput-required {
-    color: var(--secondary-color);
-  }
-
-  & .mantine-FileInput-label {
-    font-family: var(--label-font-faimly);
-  }
-
-  & .mantine-FileInput-disabled {
-    opacity: 0.6;
-  }
-
-  transition: width 0.3s ease-in-out;
-`;
-
-const StyledJsonInput = styled(MantineJsonInput)<JsonInputProps>`
-  & .mantine-JsonInput-input {
-    color: var(--input-fg);
-    background: var(--input-bg);
-
-    &::placeholder {
-      color: var(--input-placeholder-fg);
-    }
-  }
-
-  & .mantine-JsonInput-icon {
-    color: var(--input-placeholder-fg);
-  }
-
-  & .mantine-JsonInput-required {
-    color: var(--secondary-color);
-  }
-
-  & .mantine-JsonInput-label {
-    font-family: var(--label-font-faimly);
-  }
-
-  & .mantine-JsonInput-disabled {
-    opacity: 0.6;
-  }
-
-  transition: width 0.3s ease-in-out;
-`;
-
-const StyledTextarea = styled(MantineTextarea)<TextareaProps>`
-  & .mantine-Textarea-input {
-    color: var(--input-fg);
-    background: var(--input-bg);
-  }
-
-  & .mantine-Textarea-icon {
-    color: var(--input-placeholder-fg);
-  }
-
-  & .mantine-Textarea-required {
-    color: var(--secondary-color);
-  }
-
-  & .mantine-Textarea-label {
-    font-family: var(--label-font-faimly);
-  }
-
-  & .mantine-Textarea-disabled {
-    opacity: 0.6;
-  }
-
-  transition: width 0.3s ease-in-out;
-`;
-
-export const TextInput = forwardRef<HTMLInputElement, TextInputProps>(
-  ({ children, width, maxWidth, ...props }: TextInputProps, ref) => {
-    return (
-      <StyledTextInput
-        ref={ref}
-        spellCheck={false}
-        {...props}
-        sx={{ maxWidth, width }}
-      >
-        {children}
-      </StyledTextInput>
-    );
-  },
-);
-
-export const NumberInput = forwardRef<HTMLInputElement, NumberInputProps>(
-  ({ children, width, maxWidth, ...props }: NumberInputProps, ref) => {
-    return (
-      <StyledNumberInput
-        ref={ref}
-        hideControls
-        spellCheck={false}
-        {...props}
-        sx={{ maxWidth, width }}
-      >
-        {children}
-      </StyledNumberInput>
-    );
-  },
-);
-
-export const PasswordInput = forwardRef<HTMLInputElement, PasswordInputProps>(
-  ({ children, width, maxWidth, ...props }: PasswordInputProps, ref) => {
-    return (
-      <StyledPasswordInput
-        ref={ref}
-        {...props}
-        sx={{ maxWidth, width }}
-      >
-        {children}
-      </StyledPasswordInput>
-    );
-  },
-);
-
-export const FileInput = forwardRef<HTMLButtonElement, FileInputProps>(
-  ({ children, width, maxWidth, ...props }: FileInputProps, ref) => {
-    return (
-      <StyledFileInput
-        ref={ref}
-        {...props}
-        styles={{
-          placeholder: {
-            color: 'var(--input-placeholder-fg)',
-          },
-        }}
-        sx={{ maxWidth, width }}
-      >
-        {children}
-      </StyledFileInput>
-    );
-  },
-);
-
-export const JsonInput = forwardRef<HTMLTextAreaElement, JsonInputProps>(
-  ({ children, width, maxWidth, ...props }: JsonInputProps, ref) => {
-    return (
-      <StyledJsonInput
-        ref={ref}
-        {...props}
-        sx={{ maxWidth, width }}
-      >
-        {children}
-      </StyledJsonInput>
-    );
-  },
-);
-
-export const Textarea = forwardRef<HTMLTextAreaElement, TextareaProps>(
-  ({ children, width, maxWidth, ...props }: TextareaProps, ref) => {
-    return (
-      <StyledTextarea
-        ref={ref}
-        {...props}
-        sx={{ maxWidth, width }}
-      >
-        {children}
-      </StyledTextarea>
-    );
-  },
-);
-
-TextInput.defaultProps = {
-  children: undefined,
-  maxWidth: undefined,
-  width: undefined,
-};
-
-NumberInput.defaultProps = {
-  children: undefined,
-  maxWidth: undefined,
-  width: undefined,
-};
-
-PasswordInput.defaultProps = {
-  children: undefined,
-  maxWidth: undefined,
-  width: undefined,
-};
-
-FileInput.defaultProps = {
-  children: undefined,
-  maxWidth: undefined,
-  width: undefined,
-};
-
-JsonInput.defaultProps = {
-  children: undefined,
-  maxWidth: undefined,
-  width: undefined,
-};
-
-Textarea.defaultProps = {
-  children: undefined,
-  maxWidth: undefined,
-  width: undefined,
-};

src/renderer/components/modal/Modal.tsx

@@ -0,0 +1,27 @@
+import {
+  Modal as MantineModal,
+  ModalProps as MantineModalProps,
+} from '@mantine/core';
+import { useDisclosure } from '@mantine/hooks';
+
+interface ModalProps extends MantineModalProps {
+  condition: boolean;
+}
+
+export const Modal = ({ condition, children, ...rest }: ModalProps) => {
+  const [opened, handlers] = useDisclosure(false);
+
+  return (
+    <>
+      {condition && (
+        <MantineModal
+          {...rest}
+          opened={opened}
+          onClose={() => handlers.close()}
+        >
+          {children}
+        </MantineModal>
+      )}
+    </>
+  );
+};

src/renderer/components/modal/index.tsx

@@ -1,43 +0,0 @@
-import React from 'react';
-import type { ModalProps as MantineModalProps } from '@mantine/core';
-import { Modal as MantineModal } from '@mantine/core';
-import type { ContextModalProps } from '@mantine/modals';
-
-export interface ModalProps extends Omit<MantineModalProps, 'onClose'> {
-  children?: React.ReactNode;
-  handlers: {
-    close: () => void;
-    open: () => void;
-    toggle: () => void;
-  };
-}
-
-export const Modal = ({ children, handlers, ...rest }: ModalProps) => {
-  return (
-    <MantineModal
-      overlayBlur={2}
-      overlayOpacity={0.2}
-      {...rest}
-      onClose={handlers.close}
-    >
-      {children}
-    </MantineModal>
-  );
-};
-
-export type ContextModalVars = {
-  context: ContextModalProps['context'];
-  id: ContextModalProps['id'];
-};
-
-export const BaseContextModal = ({
-  context,
-  id,
-  innerProps,
-}: ContextModalProps<{
-  modalBody: (vars: ContextModalVars) => React.ReactNode;
-}>) => <>{innerProps.modalBody({ context, id })}</>;
-
-Modal.defaultProps = {
-  children: undefined,
-};

src/renderer/components/motion/index.tsx

@@ -1,10 +0,0 @@
-import { Flex, Group, Stack } from '@mantine/core';
-import { motion } from 'framer-motion';
-
-export const MotionFlex = motion(Flex);
-
-export const MotionGroup = motion(Group);
-
-export const MotionStack = motion(Stack);
-
-export const MotionDiv = motion.div;

src/renderer/components/page-header/index.tsx

@@ -1,90 +0,0 @@
-import { motion } from 'framer-motion';
-import { useEffect, useRef } from 'react';
-import styled from 'styled-components';
-import { useShouldPadTitlebar } from '/@/renderer/hooks';
-
-const Container = styled(motion.div)<{ $useOpacity?: boolean; height?: string; position?: string }>`
-  position: ${(props) => props.position};
-  z-index: 100;
-  width: 100%;
-  height: ${(props) => props.height || '60px'};
-  opacity: ${(props) => props.$useOpacity && 'var(--header-opacity)'};
-  transition: opacity 0.3s ease-in-out;
-`;
-
-const Header = styled(motion.div)<{ $padRight?: boolean }>`
-  z-index: 15;
-  height: 100%;
-  margin-right: ${(props) => props.$padRight && '170px'};
-  padding: 1rem;
-  -webkit-app-region: drag;
-
-  button {
-    -webkit-app-region: no-drag;
-  }
-
-  input {
-    -webkit-app-region: no-drag;
-  }
-`;
-
-// const BackgroundImage = styled.div<{ background: string }>`
-//   position: absolute;
-//   top: 0;
-//   z-index: -1;
-//   width: 100%;
-//   height: 100%;
-//   background: ${(props) => props.background};
-// `;
-
-// const BackgroundImageOverlay = styled.div`
-//   position: absolute;
-//   top: 0;
-//   left: 0;
-//   z-index: -1;
-//   width: 100%;
-//   height: 100%;
-//   /* background: linear-gradient(180deg, rgba(25, 26, 28, 0%), var(--main-bg)); */
-//   /* background: url('data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIzMDAiIGhlaWdodD0iMzAwIj48ZmlsdGVyIGlkPSJhIiB4PSIwIiB5PSIwIj48ZmVUdXJidWxlbmNlIHR5cGU9ImZyYWN0YWxOb2lzZSIgYmFzZUZyZXF1ZW5jeT0iLjc1IiBzdGl0Y2hUaWxlcz0ic3RpdGNoIi8+PGZlQ29sb3JNYXRyaXggdHlwZT0ic2F0dXJhdGUiIHZhbHVlcz0iMCIvPjwvZmlsdGVyPjxwYXRoIGZpbHRlcj0idXJsKCNhKSIgb3BhY2l0eT0iLjA1IiBkPSJNMCAwaDMwMHYzMDBIMHoiLz48L3N2Zz4='); */
-// `;
-
-interface PageHeaderProps {
-  backgroundColor?: string;
-  children?: React.ReactNode;
-  height?: string;
-  position?: string;
-  useOpacity?: boolean;
-}
-
-export const PageHeader = ({
-  position,
-  height,
-  backgroundColor,
-  useOpacity,
-  children,
-}: PageHeaderProps) => {
-  const ref = useRef(null);
-  const padRight = useShouldPadTitlebar();
-
-  useEffect(() => {
-    const rootElement = document.querySelector(':root') as HTMLElement;
-    rootElement?.style?.setProperty('--header-opacity', '0');
-  }, []);
-
-  return (
-    <Container
-      ref={ref}
-      $useOpacity={useOpacity}
-      animate={{
-        backgroundColor,
-        transition: { duration: 1.5 },
-      }}
-      height={height}
-      position={position}
-    >
-      <Header $padRight={padRight}>{children}</Header>
-      {/* <BackgroundImage background={backgroundColor} /> */}
-      {/* <BackgroundImageOverlay /> */}
-    </Container>
-  );
-};

src/renderer/components/pagination/index.tsx

@@ -1,53 +0,0 @@
-import {
-  Pagination as MantinePagination,
-  PaginationProps as MantinePaginationProps,
-} from '@mantine/core';
-import styled from 'styled-components';
-
-const StyledPagination = styled(MantinePagination)<PaginationProps>`
-  & .mantine-Pagination-item {
-    color: var(--btn-default-fg);
-    background-color: var(--btn-default-bg);
-    border: none;
-    transition: background 0.2s ease-in-out, color 0.2s ease-in-out;
-
-    &[data-active] {
-      color: var(--btn-primary-fg);
-      background-color: var(--btn-primary-bg);
-    }
-
-    &[data-dots] {
-      display: ${({ $hideDividers }) => ($hideDividers ? 'none' : 'block')};
-      background-color: transparent;
-    }
-
-    &:hover {
-      color: var(--btn-default-fg-hover);
-      background-color: var(--btn-default-bg-hover);
-
-      &[data-active] {
-        color: var(--btn-primary-fg-hover);
-        background-color: var(--btn-primary-bg-hover);
-      }
-
-      &[data-dots] {
-        background-color: transparent;
-      }
-    }
-  }
-`;
-
-interface PaginationProps extends MantinePaginationProps {
-  $hideDividers?: boolean;
-}
-
-export const Pagination = ({ $hideDividers, ...props }: PaginationProps) => {
-  return (
-    <StyledPagination
-      $hideDividers={$hideDividers}
-      radius="xl"
-      size="md"
-      {...props}
-    />
-  );
-};

src/renderer/components/paper/index.tsx

@@ -1,15 +0,0 @@
-import type { PaperProps as MantinePaperProps } from '@mantine/core';
-import { Paper as MantinePaper } from '@mantine/core';
-import styled from 'styled-components';
-
-export interface PaperProps extends MantinePaperProps {
-  children: React.ReactNode;
-}
-
-const StyledPaper = styled(MantinePaper)<PaperProps>`
-  background: var(--paper-bg);
-`;
-
-export const Paper = ({ children, ...props }: PaperProps) => {
-  return <StyledPaper {...props}>{children}</StyledPaper>;
-};

src/renderer/components/popover/index.tsx

@@ -1,39 +0,0 @@
-import type {
-  PopoverProps as MantinePopoverProps,
-  PopoverDropdownProps as MantinePopoverDropdownProps,
-} from '@mantine/core';
-import { Popover as MantinePopover } from '@mantine/core';
-import styled from 'styled-components';
-
-type PopoverProps = MantinePopoverProps;
-type PopoverDropdownProps = MantinePopoverDropdownProps;
-
-const StyledPopover = styled(MantinePopover)``;
-
-const StyledDropdown = styled(MantinePopover.Dropdown)<PopoverDropdownProps>`
-  padding: 0.5rem;
-  font-size: 0.9em;
-  font-family: var(--content-font-family);
-  background-color: var(--dropdown-menu-bg);
-  border: var(--dropdown-menu-border);
-`;
-
-export const Popover = ({ children, ...props }: PopoverProps) => {
-  return (
-    <StyledPopover
-      withinPortal
-      styles={{
-        dropdown: {
-          filter: 'drop-shadow(0 0 5px rgb(0, 0, 0, 50%))',
-        },
-      }}
-      transition="scale-y"
-      {...props}
-    >
-      {children}
-    </StyledPopover>
-  );
-};
-
-Popover.Target = MantinePopover.Target;
-Popover.Dropdown = StyledDropdown;

src/renderer/components/scroll-area/index.tsx

@@ -1,31 +0,0 @@
-import type { ScrollAreaProps as MantineScrollAreaProps } from '@mantine/core';
-import { ScrollArea as MantineScrollArea } from '@mantine/core';
-import styled from 'styled-components';
-
-interface ScrollAreaProps extends MantineScrollAreaProps {
-  children: React.ReactNode;
-}
-
-const StyledScrollArea = styled(MantineScrollArea)`
-  & .mantine-ScrollArea-thumb {
-    background: var(--scrollbar-thumb-bg);
-    border-radius: 0;
-  }
-
-  & .mantine-ScrollArea-scrollbar {
-    width: 12px;
-    padding: 0;
-    background: var(--scrollbar-track-bg);
-  }
-`;
-
-export const ScrollArea = ({ children, ...props }: ScrollAreaProps) => {
-  return (
-    <StyledScrollArea
-      offsetScrollbars
-      {...props}
-    >
-      {children}
-    </StyledScrollArea>
-  );
-};

src/renderer/components/search-input/index.tsx

@@ -1,61 +0,0 @@
-import { ChangeEvent, KeyboardEvent } from 'react';
-import { TextInputProps } from '@mantine/core';
-import { useFocusWithin, useHotkeys, useMergedRef } from '@mantine/hooks';
-import { RiSearchLine } from 'react-icons/ri';
-import { TextInput } from '/@/renderer/components/input';
-
-interface SearchInputProps extends TextInputProps {
-  initialWidth?: number;
-  openedWidth?: number;
-  value?: string;
-}
-
-export const SearchInput = ({
-  initialWidth,
-  onChange,
-  openedWidth,
-  ...props
-}: SearchInputProps) => {
-  const { ref, focused } = useFocusWithin();
-  const mergedRef = useMergedRef<HTMLInputElement>(ref);
-
-  const isOpened = focused || ref.current?.value;
-  const showIcon = !isOpened || (openedWidth || 100) > 100;
-
-  useHotkeys([
-    [
-      'ctrl+F',
-      () => {
-        ref.current.select();
-      },
-    ],
-  ]);
-
-  const handleEscape = (e: KeyboardEvent<HTMLInputElement>) => {
-    if (e.code === 'Escape') {
-      onChange?.({ target: { value: '' } } as ChangeEvent<HTMLInputElement>);
-      ref.current.value = '';
-      ref.current.blur();
-    }
-  };
-
-  return (
-    <TextInput
-      ref={mergedRef}
-      {...props}
-      icon={showIcon && <RiSearchLine size={15} />}
-      styles={{
-        icon: { svg: { fill: 'var(--btn-default-fg)' } },
-        input: {
-          backgroundColor: isOpened ? 'inherit' : 'transparent !important',
-          border: 'none !important',
-          cursor: isOpened ? 'text' : 'pointer',
-          padding: isOpened ? '10px' : 0,
-        },
-      }}
-      width={isOpened ? openedWidth || 150 : initialWidth || 50}
-      onChange={onChange}
-      onKeyDown={handleEscape}
-    />
-  );
-};

src/renderer/components/segmented-control/index.tsx

@@ -1,38 +0,0 @@
-import { forwardRef } from 'react';
-import type { SegmentedControlProps as MantineSegmentedControlProps } from '@mantine/core';
-import { SegmentedControl as MantineSegmentedControl } from '@mantine/core';
-import styled from 'styled-components';
-
-type SegmentedControlProps = MantineSegmentedControlProps;
-
-const StyledSegmentedControl = styled(MantineSegmentedControl)<MantineSegmentedControlProps>`
-  & .mantine-SegmentedControl-label {
-    color: var(--input-fg);
-    font-family: var(--content-font-family);
-  }
-
-  background-color: var(--input-bg);
-
-  & .mantine-SegmentedControl-disabled {
-    opacity: 0.6;
-  }
-
-  & .mantine-SegmentedControl-active {
-    color: var(--input-active-fg);
-    background-color: var(--input-active-bg);
-  }
-`;
-
-export const SegmentedControl = forwardRef<HTMLDivElement, SegmentedControlProps>(
-  ({ ...props }: SegmentedControlProps, ref) => {
-    return (
-      <StyledSegmentedControl
-        ref={ref}
-        styles={{}}
-        transitionDuration={250}
-        transitionTimingFunction="linear"
-        {...props}
-      />
-    );
-  },
-);

src/renderer/components/select/index.tsx

@@ -1,144 +0,0 @@
-import type {
-  SelectProps as MantineSelectProps,
-  MultiSelectProps as MantineMultiSelectProps,
-} from '@mantine/core';
-import { Select as MantineSelect, MultiSelect as MantineMultiSelect } from '@mantine/core';
-import styled from 'styled-components';
-
-interface SelectProps extends MantineSelectProps {
-  maxWidth?: number | string;
-  width?: number | string;
-}
-
-interface MultiSelectProps extends MantineMultiSelectProps {
-  maxWidth?: number | string;
-  width?: number | string;
-}
-
-const StyledSelect = styled(MantineSelect)`
-  & [data-selected='true'] {
-    background: var(--input-bg);
-  }
-
-  & .mantine-Select-disabled {
-    background: var(--input-bg);
-    opacity: 0.6;
-  }
-
-  & .mantine-Select-itemsWrapper {
-    & .mantine-Select-item {
-      padding: 40px;
-    }
-  }
-`;
-
-export const Select = ({ width, maxWidth, ...props }: SelectProps) => {
-  return (
-    <StyledSelect
-      withinPortal
-      styles={{
-        dropdown: {
-          background: 'var(--dropdown-menu-bg)',
-          filter: 'drop-shadow(0 0 5px rgb(0, 0, 0, 20%))',
-        },
-        input: {
-          background: 'var(--input-bg)',
-          color: 'var(--input-fg)',
-        },
-        item: {
-          '&:hover': {
-            background: 'var(--dropdown-menu-bg-hover)',
-          },
-          '&[data-hovered]': {
-            background: 'var(--dropdown-menu-bg-hover)',
-          },
-          '&[data-selected="true"]': {
-            '&:hover': {
-              background: 'var(--dropdown-menu-bg-hover)',
-            },
-            background: 'none',
-            color: 'var(--primary-color)',
-          },
-          color: 'var(--dropdown-menu-fg)',
-          padding: '.3rem',
-        },
-      }}
-      sx={{ maxWidth, width }}
-      transition="pop"
-      transitionDuration={100}
-      {...props}
-    />
-  );
-};
-
-const StyledMultiSelect = styled(MantineMultiSelect)`
-  & [data-selected='true'] {
-    background: var(--input-select-bg);
-  }
-
-  & .mantine-MultiSelect-disabled {
-    background: var(--input-select-bg);
-    opacity: 0.6;
-  }
-
-  & .mantine-MultiSelect-itemsWrapper {
-    & .mantine-Select-item {
-      padding: 40px;
-    }
-  }
-`;
-
-export const MultiSelect = ({ width, maxWidth, ...props }: MultiSelectProps) => {
-  return (
-    <StyledMultiSelect
-      withinPortal
-      styles={{
-        dropdown: {
-          background: 'var(--dropdown-menu-bg)',
-          filter: 'drop-shadow(0 0 5px rgb(0, 0, 0, 20%))',
-        },
-        input: {
-          background: 'var(--input-bg)',
-          color: 'var(--input-fg)',
-        },
-        item: {
-          '&:hover': {
-            background: 'var(--dropdown-menu-bg-hover)',
-          },
-          '&[data-hovered]': {
-            background: 'var(--dropdown-menu-bg-hover)',
-          },
-          '&[data-selected="true"]': {
-            '&:hover': {
-              background: 'var(--dropdown-menu-bg-hover)',
-            },
-            background: 'none',
-            color: 'var(--primary-color)',
-          },
-          color: 'var(--dropdown-menu-fg)',
-          padding: '.5rem .1rem',
-        },
-        value: {
-          margin: '.2rem',
-          paddingBottom: '1rem',
-          paddingLeft: '1rem',
-          paddingTop: '1rem',
-        },
-      }}
-      sx={{ maxWidth, width }}
-      transition="pop"
-      transitionDuration={100}
-      {...props}
-    />
-  );
-};
-
-Select.defaultProps = {
-  maxWidth: undefined,
-  width: undefined,
-};
-
-MultiSelect.defaultProps = {
-  maxWidth: undefined,
-  width: undefined,
-};

src/renderer/components/skeleton/index.tsx

@@ -1,45 +0,0 @@
-import type { SkeletonProps as MantineSkeletonProps } from '@mantine/core';
-import { Skeleton as MantineSkeleton } from '@mantine/core';
-import styled from 'styled-components';
-
-const StyledSkeleton = styled(MantineSkeleton)`
-  @keyframes run {
-    0% {
-      left: 0;
-      transform: translateX(-100%);
-    }
-
-    80% {
-      transform: translateX(100%);
-    }
-
-    100% {
-      transform: translateX(100%);
-    }
-  }
-
-  &::before {
-    background: var(--skeleton-bg);
-  }
-
-  &::after {
-    position: absolute;
-    background: linear-gradient(90deg, transparent, var(--skeleton-bg), transparent);
-    transform: translateX(-100%);
-    animation-name: run;
-    animation-duration: 1.5s;
-    animation-timing-function: linear;
-    animation-iteration-count: infinite;
-    content: '';
-    inset: 0;
-  }
-`;
-
-export const Skeleton = ({ ...props }: MantineSkeletonProps) => {
-  return (
-    <StyledSkeleton
-      animate={false}
-      {...props}
-    />
-  );
-};

src/renderer/components/slider/index.tsx

@@ -1,30 +0,0 @@
-import type { SliderProps as MantineSliderProps } from '@mantine/core';
-import { Slider as MantineSlider } from '@mantine/core';
-import styled from 'styled-components';
-
-type SliderProps = MantineSliderProps;
-
-const StyledSlider = styled(MantineSlider)`
-  & .mantine-Slider-track {
-    height: 0.5rem;
-    background-color: var(--slider-track-bg);
-  }
-
-  & .mantine-Slider-thumb {
-    width: 1rem;
-    height: 1rem;
-    background: var(--slider-thumb-bg);
-    border: none;
-  }
-
-  & .mantine-Slider-label {
-    padding: 0 1rem;
-    color: var(--tooltip-fg);
-    font-size: 1em;
-    background: var(--tooltip-bg);
-  }
-`;
-
-export const Slider = ({ ...props }: SliderProps) => {
-  return <StyledSlider {...props} />;
-};

src/renderer/components/spinner/index.tsx

@@ -1,23 +0,0 @@
-import type { IconType } from 'react-icons';
-import { RiLoader5Fill } from 'react-icons/ri';
-import styled from 'styled-components';
-import { rotating } from '/@/renderer/styles';
-
-interface SpinnerProps extends IconType {
-  color?: string;
-  size?: number;
-}
-
-export const SpinnerIcon = styled(RiLoader5Fill)`
-  ${rotating}
-  animation: rotating 1s ease-in-out infinite;
-`;
-
-export const Spinner = ({ ...props }: SpinnerProps) => {
-  return <SpinnerIcon {...props} />;
-};
-
-Spinner.defaultProps = {
-  color: undefined,
-  size: 15,
-};

src/renderer/components/switch/index.tsx

@@ -1,28 +0,0 @@
-import type { SwitchProps as MantineSwitchProps } from '@mantine/core';
-import { Switch as MantineSwitch } from '@mantine/core';
-import styled from 'styled-components';
-
-type SwitchProps = MantineSwitchProps;
-
-const StyledSwitch = styled(MantineSwitch)`
-  display: flex;
-
-  & .mantine-Switch-track {
-    background-color: var(--switch-track-bg);
-    border: none;
-  }
-
-  & .mantine-Switch-input {
-    &:checked + .mantine-Switch-track {
-      background-color: var(--switch-track-enabled-bg);
-    }
-  }
-
-  & .mantine-Switch-thumb {
-    background-color: var(--switch-thumb-bg);
-  }
-`;
-
-export const Switch = ({ ...props }: SwitchProps) => {
-  return <StyledSwitch {...props} />;
-};

src/renderer/components/tabs/index.tsx

@@ -1,52 +0,0 @@
-import type { TabsProps as MantineTabsProps } from '@mantine/core';
-import { Tabs as MantineTabs } from '@mantine/core';
-import styled from 'styled-components';
-
-type TabsProps = MantineTabsProps;
-
-const StyledTabs = styled(MantineTabs)`
-  height: 100%;
-
-  & .mantine-Tabs-tabsList {
-    padding-right: 1rem;
-  }
-
-  &.mantine-Tabs-tab {
-    background-color: var(--main-bg);
-  }
-
-  & .mantine-Tabs-panel {
-    padding: 0 1rem;
-  }
-
-  button {
-    padding: 1rem;
-    color: var(--btn-subtle-fg);
-
-    &:hover {
-      color: var(--btn-subtle-fg-hover);
-      background: var(--btn-subtle-bg-hover);
-    }
-
-    transition: background 0.2s ease-in-out, color 0.2s ease-in-out;
-  }
-
-  button[data-active] {
-    color: var(--btn-primary-fg);
-    background: var(--primary-color);
-    border-color: var(--primary-color);
-
-    &:hover {
-      background: var(--btn-primary-bg-hover);
-      border-color: var(--primary-color);
-    }
-  }
-`;
-
-export const Tabs = ({ children, ...props }: TabsProps) => {
-  return <StyledTabs {...props}>{children}</StyledTabs>;
-};
-
-Tabs.List = StyledTabs.List;
-Tabs.Panel = StyledTabs.Panel;
-Tabs.Tab = StyledTabs.Tab;

src/renderer/components/text-title/index.tsx

@@ -1,55 +0,0 @@
-import type { ComponentPropsWithoutRef, ReactNode } from 'react';
-import type { TitleProps as MantineTitleProps } from '@mantine/core';
-import { createPolymorphicComponent, Title as MantineHeader } from '@mantine/core';
-import styled from 'styled-components';
-import { textEllipsis } from '/@/renderer/styles';
-
-type MantineTextTitleDivProps = MantineTitleProps & ComponentPropsWithoutRef<'div'>;
-
-interface TextTitleProps extends MantineTextTitleDivProps {
-  $link?: boolean;
-  $noSelect?: boolean;
-  $secondary?: boolean;
-  children: ReactNode;
-  overflow?: 'hidden' | 'visible';
-  to?: string;
-  weight?: number;
-}
-
-const StyledTextTitle = styled(MantineHeader)<TextTitleProps>`
-  color: ${(props) => (props.$secondary ? 'var(--main-fg-secondary)' : 'var(--main-fg)')};
-  cursor: ${(props) => props.$link && 'cursor'};
-  transition: color 0.2s ease-in-out;
-  user-select: ${(props) => (props.$noSelect ? 'none' : 'auto')};
-  ${(props) => props.overflow === 'hidden' && textEllipsis}
-
-  &:hover {
-    color: ${(props) => props.$link && 'var(--main-fg)'};
-    text-decoration: ${(props) => (props.$link ? 'underline' : 'none')};
-  }
-`;
-
-const _TextTitle = ({ children, $secondary, overflow, $noSelect, ...rest }: TextTitleProps) => {
-  return (
-    <StyledTextTitle
-      $noSelect={$noSelect}
-      $secondary={$secondary}
-      overflow={overflow}
-      {...rest}
-    >
-      {children}
-    </StyledTextTitle>
-  );
-};
-
-export const TextTitle = createPolymorphicComponent<'div', TextTitleProps>(_TextTitle);
-
-_TextTitle.defaultProps = {
-  $link: false,
-  $noSelect: false,
-  $secondary: false,
-  font: undefined,
-  overflow: 'visible',
-  to: '',
-  weight: 400,
-};

src/renderer/components/text/Text.tsx

@@ -0,0 +1,95 @@
+import { ReactNode } from 'react';
+import {
+  Text as MantineText,
+  TextProps as MantineTextProps,
+} from '@mantine/core';
+import { Link } from 'react-router-dom';
+import styled from 'styled-components';
+import { Font } from 'renderer/styles';
+import { textEllipsis } from 'renderer/styles/mixins';
+
+interface TextProps extends MantineTextProps<'div'> {
+  children: ReactNode;
+  font?: Font;
+  link?: boolean;
+  noSelect?: boolean;
+  overflow?: 'hidden' | 'visible';
+  secondary?: boolean;
+  to?: string;
+  weight?: number;
+}
+
+interface LinkTextProps extends MantineTextProps<'Link'> {
+  children: ReactNode;
+  font?: Font;
+  link?: boolean;
+  overflow?: 'hidden' | 'visible';
+  secondary?: boolean;
+  to: string;
+  weight?: number;
+}
+
+const BaseText = styled(MantineText)<any>`
+  color: ${(props) =>
+    props.$secondary
+      ? 'var(--playerbar-text-secondary-color)'
+      : 'var(--playerbar-text-primary-color)'};
+  font-family: ${(props) => props.font || Font.GOTHAM};
+  cursor: ${(props) => (props.link ? 'cursor' : 'default')};
+  user-select: ${(props) => (props.$noSelect ? 'none' : 'auto')};
+  ${(props) => props.overflow === 'hidden' && textEllipsis}
+`;
+
+const StyledText = styled(BaseText)<TextProps>``;
+
+const StyledLinkText = styled(BaseText)<LinkTextProps>``;
+
+export const Text = ({
+  children,
+  link,
+  secondary,
+  overflow,
+  font,
+  to,
+  noSelect,
+  ...rest
+}: TextProps) => {
+  if (link) {
+    return (
+      <StyledLinkText<typeof Link>
+        $noSelect={noSelect}
+        $secondary={secondary}
+        component={Link}
+        font={font}
+        link="true"
+        overflow={overflow}
+        to={to || ''}
+        {...rest}
+      >
+        {children}
+      </StyledLinkText>
+    );
+  }
+
+  return (
+    <StyledText
+      $noSelect={noSelect}
+      $secondary={secondary}
+      font={font}
+      overflow={overflow}
+      {...rest}
+    >
+      {children}
+    </StyledText>
+  );
+};
+
+Text.defaultProps = {
+  font: Font.GOTHAM,
+  link: false,
+  noSelect: false,
+  overflow: 'visible',
+  secondary: false,
+  to: '',
+  weight: 500,
+};

src/renderer/components/text/index.tsx

@@ -1,59 +0,0 @@
-import type { ComponentPropsWithoutRef, ReactNode } from 'react';
-import type { TextProps as MantineTextProps } from '@mantine/core';
-import { createPolymorphicComponent, Text as MantineText } from '@mantine/core';
-import styled from 'styled-components';
-import type { Font } from '/@/renderer/styles';
-import { textEllipsis } from '/@/renderer/styles';
-
-type MantineTextDivProps = MantineTextProps & ComponentPropsWithoutRef<'div'>;
-
-interface TextProps extends MantineTextDivProps {
-  $link?: boolean;
-  $noSelect?: boolean;
-  $secondary?: boolean;
-  children: ReactNode;
-  font?: Font;
-  overflow?: 'hidden' | 'visible';
-  to?: string;
-  weight?: number;
-}
-
-const StyledText = styled(MantineText)<TextProps>`
-  color: ${(props) => (props.$secondary ? 'var(--main-fg-secondary)' : 'var(--main-fg)')};
-  font-family: ${(props) => props.font};
-  cursor: ${(props) => props.$link && 'cursor'};
-  transition: color 0.2s ease-in-out;
-  user-select: ${(props) => (props.$noSelect ? 'none' : 'auto')};
-  ${(props) => props.overflow === 'hidden' && textEllipsis}
-
-  &:hover {
-    color: ${(props) => props.$link && 'var(--main-fg)'};
-    text-decoration: ${(props) => (props.$link ? 'underline' : 'none')};
-  }
-`;
-
-const _Text = ({ children, $secondary, overflow, font, $noSelect, ...rest }: TextProps) => {
-  return (
-    <StyledText
-      $noSelect={$noSelect}
-      $secondary={$secondary}
-      font={font}
-      overflow={overflow}
-      {...rest}
-    >
-      {children}
-    </StyledText>
-  );
-};
-
-export const Text = createPolymorphicComponent<'div', TextProps>(_Text);
-
-_Text.defaultProps = {
-  $link: false,
-  $noSelect: false,
-  $secondary: false,
-  font: undefined,
-  overflow: 'visible',
-  to: '',
-  weight: 400,
-};

src/renderer/components/toast/index.tsx

@@ -1,71 +0,0 @@
-import type { NotificationProps as MantineNotificationProps } from '@mantine/notifications';
-import {
-  showNotification,
-  updateNotification,
-  hideNotification,
-  cleanNotifications,
-  cleanNotificationsQueue,
-} from '@mantine/notifications';
-
-interface NotificationProps extends MantineNotificationProps {
-  type?: 'success' | 'error' | 'warning' | 'info';
-}
-
-const showToast = ({ type, ...props }: NotificationProps) => {
-  const color =
-    type === 'success'
-      ? 'var(--success-color)'
-      : type === 'warning'
-      ? 'var(--warning-color)'
-      : type === 'error'
-      ? 'var(--danger-color)'
-      : 'var(--primary-color)';
-
-  const defaultTitle =
-    type === 'success'
-      ? 'Success'
-      : type === 'warning'
-      ? 'Warning'
-      : type === 'error'
-      ? 'Error'
-      : 'Info';
-
-  const defaultDuration = type === 'error' ? 3500 : 2000;
-
-  return showNotification({
-    autoClose: defaultDuration,
-    disallowClose: true,
-    styles: () => ({
-      closeButton: {},
-      description: {
-        color: 'var(--toast-description-fg)',
-        fontSize: '.9em',
-      },
-      loader: {
-        margin: '1rem',
-      },
-      root: {
-        '&::before': { backgroundColor: color },
-        background: 'var(--toast-bg)',
-      },
-      title: {
-        color: 'var(--toast-title-fg)',
-        fontSize: '1em',
-      },
-    }),
-    title: defaultTitle,
-    ...props,
-  });
-};
-
-export const toast = {
-  clean: cleanNotifications,
-  cleanQueue: cleanNotificationsQueue,
-  error: (props: NotificationProps) => showToast({ type: 'error', ...props }),
-  hide: hideNotification,
-  info: (props: NotificationProps) => showToast({ type: 'info', ...props }),
-  show: showToast,
-  success: (props: NotificationProps) => showToast({ type: 'success', ...props }),
-  update: updateNotification,
-  warn: (props: NotificationProps) => showToast({ type: 'warning', ...props }),
-};

src/renderer/components/tooltip/Tooltip.module.scss

@@ -0,0 +1,9 @@
+.body {
+  padding: 5px;
+  color: var(--tooltip-text-color);
+  background: var(--tooltip-bg);
+}
+
+.arrow {
+  background: var(--tooltip-bg);
+}

src/renderer/components/tooltip/Tooltip.tsx

@@ -0,0 +1,32 @@
+import { Tooltip as MantineTooltip, TooltipProps } from '@mantine/core';
+import styles from './Tooltip.module.scss';
+
+export const Tooltip = ({ children, ...rest }: TooltipProps) => {
+  return (
+    <MantineTooltip
+      classNames={{ arrow: styles.arrow, body: styles.body }}
+      radius="xs"
+      styles={{
+        arrow: {
+          background: 'var(--tooltip-bg)',
+        },
+        body: {
+          background: 'var(--tooltip-bg)',
+          color: 'var(--tooltip-text-color)',
+          padding: '5px',
+        },
+      }}
+      {...rest}
+    >
+      {children}
+    </MantineTooltip>
+  );
+};
+
+Tooltip.defaultProps = {
+  openDelay: 0,
+  placement: 'center',
+  transition: 'fade',
+  transitionDuration: 250,
+  withArrow: true,
+};

src/renderer/components/tooltip/index.tsx

@@ -1,44 +0,0 @@
-import type { TooltipProps } from '@mantine/core';
-import { Tooltip as MantineTooltip } from '@mantine/core';
-import styled from 'styled-components';
-
-const StyledTooltip = styled(MantineTooltip)`
-  & .mantine-Tooltip-tooltip {
-    margin: 20px;
-  }
-`;
-
-export const Tooltip = ({ children, ...rest }: TooltipProps) => {
-  return (
-    <StyledTooltip
-      multiline
-      withinPortal
-      pl={10}
-      pr={10}
-      py={5}
-      radius="xs"
-      styles={{
-        tooltip: {
-          background: 'var(--tooltip-bg)',
-          boxShadow: '4px 4px 10px 0px rgba(0,0,0,0.2)',
-          color: 'var(--tooltip-fg)',
-          fontSize: '1.1rem',
-          fontWeight: 550,
-          maxWidth: '250px',
-        },
-      }}
-      {...rest}
-    >
-      {children}
-    </StyledTooltip>
-  );
-};
-
-Tooltip.defaultProps = {
-  openDelay: 0,
-  position: 'top',
-  transition: 'fade',
-  transitionDuration: 250,
-  withArrow: true,
-  withinPortal: true,
-};