Add remote control (#164)

* draft add remotes

* add favorite, rating

* add basic auth

src/main/preload/ipc.ts

@@ -12,3 +12,5 @@ export const ipc = {
     removeAllListeners,
     send,
 };
+
+export type Ipc = typeof ipc;

src/main/preload/local-settings.ts

@@ -1,5 +1,5 @@
-import { ipcRenderer, webFrame } from 'electron';
 import Store from 'electron-store';
+import { ipcRenderer, webFrame } from 'electron';
 
 const store = new Store();
 
@@ -50,3 +50,5 @@ export const localSettings = {
     set,
     setZoomFactor,
 };
+
+export type LocalSettings = typeof localSettings;

src/main/preload/lyrics.ts

@@ -1,17 +1,25 @@
 import { ipcRenderer } from 'electron';
-import { LyricSearchQuery, QueueSong } from '/@/renderer/api/types';
+import {
+    InternetProviderLyricSearchResponse,
+    LyricGetQuery,
+    LyricSearchQuery,
+    LyricSource,
+    QueueSong,
+} from '/@/renderer/api/types';
 
 const getRemoteLyricsBySong = (song: QueueSong) => {
     const result = ipcRenderer.invoke('lyric-by-song', song);
     return result;
 };
 
-const searchRemoteLyrics = (params: LyricSearchQuery) => {
+const searchRemoteLyrics = (
+    params: LyricSearchQuery,
+): Promise<Record<LyricSource, InternetProviderLyricSearchResponse[]>> => {
     const result = ipcRenderer.invoke('lyric-search', params);
     return result;
 };
 
-const getRemoteLyricsByRemoteId = (id: string) => {
+const getRemoteLyricsByRemoteId = (id: LyricGetQuery) => {
     const result = ipcRenderer.invoke('lyric-by-remote-id', id);
     return result;
 };
@@ -21,3 +29,5 @@ export const lyrics = {
     getRemoteLyricsBySong,
     searchRemoteLyrics,
 };
+
+export type Lyrics = typeof lyrics;

src/main/preload/mpris.ts

@@ -1,9 +1,5 @@
 import { IpcRendererEvent, ipcRenderer } from 'electron';
-import { QueueSong } from '/@/renderer/api/types';
-
-const updateSong = (args: { currentTime: number; song: QueueSong }) => {
-    ipcRenderer.send('mpris-update-song', args);
-};
+import type { PlayerRepeat } from '/@/renderer/types';
 
 const updatePosition = (timeSec: number) => {
     ipcRenderer.send('mpris-update-position', timeSec);
@@ -13,18 +9,6 @@ const updateSeek = (timeSec: number) => {
     ipcRenderer.send('mpris-update-seek', timeSec);
 };
 
-const updateVolume = (volume: number) => {
-    ipcRenderer.send('mpris-update-volume', volume);
-};
-
-const updateRepeat = (repeat: string) => {
-    ipcRenderer.send('mpris-update-repeat', repeat);
-};
-
-const updateShuffle = (shuffle: boolean) => {
-    ipcRenderer.send('mpris-update-shuffle', shuffle);
-};
-
 const toggleRepeat = () => {
     ipcRenderer.send('mpris-toggle-repeat');
 };
@@ -33,38 +17,25 @@ const toggleShuffle = () => {
     ipcRenderer.send('mpris-toggle-shuffle');
 };
 
-const requestPosition = (cb: (event: IpcRendererEvent, data: { position: number }) => void) => {
-    ipcRenderer.on('mpris-request-position', cb);
-};
-
-const requestSeek = (cb: (event: IpcRendererEvent, data: { offset: number }) => void) => {
-    ipcRenderer.on('mpris-request-seek', cb);
-};
-
-const requestVolume = (cb: (event: IpcRendererEvent, data: { volume: number }) => void) => {
-    ipcRenderer.on('mpris-request-volume', cb);
-};
-
-const requestToggleRepeat = (cb: (event: IpcRendererEvent) => void) => {
+const requestToggleRepeat = (
+    cb: (event: IpcRendererEvent, data: { repeat: PlayerRepeat }) => void,
+) => {
     ipcRenderer.on('mpris-request-toggle-repeat', cb);
 };
 
-const requestToggleShuffle = (cb: (event: IpcRendererEvent) => void) => {
+const requestToggleShuffle = (
+    cb: (event: IpcRendererEvent, data: { shuffle: boolean }) => void,
+) => {
     ipcRenderer.on('mpris-request-toggle-shuffle', cb);
 };
 
 export const mpris = {
-    requestPosition,
-    requestSeek,
     requestToggleRepeat,
     requestToggleShuffle,
-    requestVolume,
     toggleRepeat,
     toggleShuffle,
     updatePosition,
-    updateRepeat,
     updateSeek,
-    updateShuffle,
-    updateSong,
-    updateVolume,
 };
+
+export type Mpris = typeof mpris;

src/main/preload/mpv-player.ts

@@ -1,5 +1,5 @@
 import { ipcRenderer, IpcRendererEvent } from 'electron';
-import { PlayerData } from '/@/renderer/store';
+import { PlayerData, PlayerState } from '/@/renderer/store';
 
 const initialize = (data: { extraParameters?: string[]; properties?: Record<string, any> }) => {
     ipcRenderer.send('player-initialize', data);
@@ -30,8 +30,8 @@ const currentTime = () => {
     ipcRenderer.send('player-current-time');
 };
 
-const mute = () => {
-    ipcRenderer.send('player-mute');
+const mute = (mute: boolean) => {
+    ipcRenderer.send('player-mute', mute);
 };
 
 const next = () => {
@@ -158,7 +158,9 @@ const rendererSaveQueue = (cb: (event: IpcRendererEvent) => void) => {
     ipcRenderer.on('renderer-player-save-queue', cb);
 };
 
-const rendererRestoreQueue = (cb: (event: IpcRendererEvent) => void) => {
+const rendererRestoreQueue = (
+    cb: (event: IpcRendererEvent, data: Partial<PlayerState>) => void,
+) => {
     ipcRenderer.on('renderer-player-restore-queue', cb);
 };
 
@@ -212,3 +214,6 @@ export const mpvPlayerListener = {
     rendererVolumeMute,
     rendererVolumeUp,
 };
+
+export type MpvPLayer = typeof mpvPlayer;
+export type MpvPlayerListener = typeof mpvPlayerListener;

src/main/preload/remote.ts

@@ -0,0 +1,101 @@
+import { IpcRendererEvent, ipcRenderer } from 'electron';
+import { SongUpdate } from '/@/renderer/types';
+
+const requestFavorite = (
+    cb: (
+        event: IpcRendererEvent,
+        data: { favorite: boolean; id: string; serverId: string },
+    ) => void,
+) => {
+    ipcRenderer.on('request-favorite', cb);
+};
+
+const requestPosition = (cb: (event: IpcRendererEvent, data: { position: number }) => void) => {
+    ipcRenderer.on('request-position', cb);
+};
+
+const requestRating = (
+    cb: (event: IpcRendererEvent, data: { id: string; rating: number; serverId: string }) => void,
+) => {
+    ipcRenderer.on('request-rating', cb);
+};
+
+const requestSeek = (cb: (event: IpcRendererEvent, data: { offset: number }) => void) => {
+    ipcRenderer.on('request-seek', cb);
+};
+
+const requestVolume = (cb: (event: IpcRendererEvent, data: { volume: number }) => void) => {
+    ipcRenderer.on('request-volume', cb);
+};
+
+const setRemoteEnabled = (enabled: boolean): Promise<string | null> => {
+    const result = ipcRenderer.invoke('remote-enable', enabled);
+    return result;
+};
+
+const setRemotePort = (port: number): Promise<string | null> => {
+    const result = ipcRenderer.invoke('remote-port', port);
+    return result;
+};
+
+const updateFavorite = (favorite: boolean, serverId: string, ids: string[]) => {
+    ipcRenderer.send('update-favorite', favorite, serverId, ids);
+};
+
+const updatePassword = (password: string) => {
+    ipcRenderer.send('remote-password', password);
+};
+
+const updateSetting = (
+    enabled: boolean,
+    port: number,
+    username: string,
+    password: string,
+): Promise<string | null> => {
+    return ipcRenderer.invoke('remote-settings', enabled, port, username, password);
+};
+
+const updateRating = (rating: number, serverId: string, ids: string[]) => {
+    ipcRenderer.send('update-rating', rating, serverId, ids);
+};
+
+const updateRepeat = (repeat: string) => {
+    ipcRenderer.send('update-repeat', repeat);
+};
+
+const updateShuffle = (shuffle: boolean) => {
+    ipcRenderer.send('update-shuffle', shuffle);
+};
+
+const updateSong = (args: SongUpdate) => {
+    ipcRenderer.send('update-song', args);
+};
+
+const updateUsername = (username: string) => {
+    ipcRenderer.send('remote-username', username);
+};
+
+const updateVolume = (volume: number) => {
+    ipcRenderer.send('update-volume', volume);
+};
+
+export const remote = {
+    requestFavorite,
+    requestPosition,
+    requestRating,
+    requestSeek,
+    requestVolume,
+    setRemoteEnabled,
+    setRemotePort,
+    updateFavorite,
+    updatePassword,
+    updateRating,
+    updateRepeat,
+    updateSetting,
+    updateShuffle,
+    updateSong,
+    updateUsername,
+    updateVolume,
+};
+
+export type Remote = typeof remote;

src/main/preload/utils.ts

@@ -5,3 +5,5 @@ export const utils = {
     isMacOS,
     isWindows,
 };
+
+export type Utils = typeof utils;