新增HTTP开放API服务

src/renderer/core/useApp/index.ts

@@ -4,6 +4,7 @@ import { proxy, isFullscreen, themeId } from '@renderer/store'
 import { appSetting } from '@renderer/store/setting'
 
 import useSync from './useSync'
+import useOpenAPI from './useOpenAPI'
 import useUpdate from './useUpdate'
 import useDataInit from './useDataInit'
 import useHandleEnvParams from './useHandleEnvParams'
@@ -25,6 +26,7 @@ export default () => {
 
   const router = useRouter()
   const initSyncService = useSync()
+  const initOpenAPI = useOpenAPI()
   useEventListener()
   const initPlayer = usePlayer()
   const handleEnvParams = useHandleEnvParams()
@@ -62,6 +64,7 @@ export default () => {
       handleEnvParams(envParams) // 处理传入的启动参数
       void initDeeplink(envParams)
       void initSyncService()
+      void initOpenAPI()
       sendInited()
 
       handleListAutoUpdate()

src/renderer/core/useApp/useOpenAPI.ts

@@ -0,0 +1,42 @@
+import { watch } from '@common/utils/vueTools'
+import { appSetting } from '@renderer/store/setting'
+import { sendOpenAPIAction } from '@renderer/utils/ipc'
+import { openAPI } from '@renderer/store'
+import { setAutoPause } from '@renderer/core/lyric'
+
+export default () => {
+  const handleEnable = async(enable: boolean, port: string) => {
+    await sendOpenAPIAction({
+      action: 'enable',
+      data: {
+        enable,
+        port,
+      },
+    }).then((status) => {
+      openAPI.address = status.address
+      openAPI.message = status.message
+    }).catch((error) => {
+      openAPI.address = ''
+      openAPI.message = error.message
+    }).finally(() => {
+      if (openAPI.address) {
+        setAutoPause(false)
+      } else {
+        setAutoPause(true)
+      }
+    })
+  }
+  watch(() => appSetting['openAPI.enable'], enable => {
+    void handleEnable(enable, appSetting['openAPI.port'])
+  })
+
+  watch(() => appSetting['openAPI.port'], port => {
+    void handleEnable(appSetting['openAPI.enable'], port)
+  })
+
+  return async() => {
+    if (appSetting['openAPI.enable']) {
+      void handleEnable(true, appSetting['openAPI.port'])
+    }
+  }
+}

src/renderer/core/useApp/usePlayer/usePlayProgress.ts

@@ -1,7 +1,7 @@
 import { onBeforeUnmount, watch } from '@common/utils/vueTools'
 import { formatPlayTime2, getRandom } from '@common/utils/common'
 import { throttle } from '@common/utils'
-import { setTaskBarProgress, savePlayInfo } from '@renderer/utils/ipc'
+import { savePlayInfo } from '@renderer/utils/ipc'
 import { onTimeupdate, getCurrentTime, getDuration, setCurrentTime, onVisibilityChange } from '@renderer/plugins/player'
 import { playProgress, setNowPlayTime, setMaxplayTime } from '@renderer/store/player/playProgress'
 import { musicInfo, playMusicInfo, playInfo } from '@renderer/store/player/state'
@@ -14,7 +14,6 @@ const delaySavePlayInfo = throttle(savePlayInfo, 2000)
 
 export default () => {
   let restorePlayTime = 0
-  let prevProgressStatus: Electron.ProgressBarOptions['mode'] = 'none'
   const mediaBuffer: {
     timeout: NodeJS.Timeout | null
     playTime: number
@@ -75,32 +74,18 @@ export default () => {
     // if (!isPlay) audio.play()
   }
 
-  const handleSetTaskBarState = (progress: number, status?: Electron.ProgressBarOptions['mode']) => {
-    if (appSetting['player.isShowTaskProgess']) setTaskBarProgress(progress, status)
-  }
-
-  const handlePlay = () => {
-    prevProgressStatus = 'normal'
-    handleSetTaskBarState(playProgress.progress, prevProgressStatus)
-  }
   const handlePause = () => {
-    prevProgressStatus = 'paused'
-    handleSetTaskBarState(playProgress.progress, prevProgressStatus)
     clearBufferTimeout()
   }
 
   const handleStop = () => {
     setNowPlayTime(0)
     setMaxplayTime(0)
-    prevProgressStatus = 'none'
-    handleSetTaskBarState(playProgress.progress, prevProgressStatus)
   }
 
   const handleError = () => {
     restorePlayTime ||= getCurrentTime() // 记录出错的播放时间
     console.log('handleError')
-    prevProgressStatus = 'error'
-    handleSetTaskBarState(playProgress.progress, prevProgressStatus)
   }
 
   const handleLoadeddata = () => {
@@ -157,10 +142,6 @@ export default () => {
     }
   }
 
-  watch(() => playProgress.progress, (newValue, oldValue) => {
-    if (newValue.toFixed(2) === oldValue.toFixed(2)) return
-    handleSetTaskBarState(newValue, prevProgressStatus)
-  })
   watch(() => playProgress.nowPlayTime, (newValue, oldValue) => {
     if (Math.abs(newValue - oldValue) > 2) window.app_event.activePlayProgressTransition()
     if (appSetting['player.isSavePlayTime'] && !playMusicInfo.isTempPlay) {
@@ -183,7 +164,7 @@ export default () => {
     }
   })
 
-  window.app_event.on('play', handlePlay)
+  // window.app_event.on('play', handlePlay)
   window.app_event.on('pause', handlePause)
   window.app_event.on('stop', handleStop)
   window.app_event.on('error', handleError)
@@ -213,7 +194,7 @@ export default () => {
   onBeforeUnmount(() => {
     rOnTimeupdate()
     rVisibilityChange()
-    window.app_event.off('play', handlePlay)
+    // window.app_event.off('play', handlePlay)
     window.app_event.off('pause', handlePause)
     window.app_event.off('stop', handleStop)
     window.app_event.off('error', handleError)

src/renderer/core/useApp/usePlayer/usePlayStatus.ts

@@ -1,55 +1,65 @@
-import { onBeforeUnmount } from '@common/utils/vueTools'
-import { setPlayerAction, onPlayerAction } from '@renderer/utils/ipc'
+import { onBeforeUnmount, watch } from '@common/utils/vueTools'
+import { sendPlayerStatus, onPlayerAction } from '@renderer/utils/ipc'
 // import store from '@renderer/store'
 
 import { loveList } from '@renderer/store/list/state'
 import { addListMusics, removeListMusics, checkListExistMusic } from '@renderer/store/list/action'
-import { playMusicInfo } from '@renderer/store/player/state'
+import { playMusicInfo, musicInfo } from '@renderer/store/player/state'
 import { throttle } from '@common/utils'
 import { pause, play, playNext, playPrev } from '@renderer/core/player'
+import { playProgress } from '@renderer/store/player/playProgress'
 
 export default () => {
   // const setVisibleDesktopLyric = useCommit('setVisibleDesktopLyric')
   // const setLockDesktopLyric = useCommit('setLockDesktopLyric')
+  let collect = false
 
-  const buttons = {
-    empty: true,
-    collect: false,
-    play: false,
-    prev: true,
-    next: true,
-    lrc: false,
-    lockLrc: false,
-  }
-  const setButtons = () => {
-    setPlayerAction(buttons)
-  }
   const updateCollectStatus = async() => {
     let status = !!playMusicInfo.musicInfo && await checkListExistMusic(loveList.id, playMusicInfo.musicInfo.id)
-    if (buttons.collect == status) return false
-    buttons.collect = status
+    if (collect == status) return false
+    collect = status
     return true
   }
 
   const handlePlay = () => {
-    buttons.empty &&= false
-    buttons.play = true
-    setButtons()
+    sendPlayerStatus({ status: 'playing' })
   }
   const handlePause = () => {
-    buttons.empty &&= false
-    buttons.play = false
-    setButtons()
+    sendPlayerStatus({ status: 'paused' })
   }
   const handleStop = () => {
     if (playMusicInfo.musicInfo != null) return
-    buttons.collect &&= false
-    buttons.empty = true
-    setButtons()
+    sendPlayerStatus({ status: 'stoped' })
   }
-  const handleSetPlayInfo = () => {
-    void updateCollectStatus().then(isExist => {
-      if (isExist) setButtons()
+  const handleError = () => {
+    sendPlayerStatus({ status: 'error' })
+  }
+  const handleSetPlayInfo = async() => {
+    await updateCollectStatus()
+    sendPlayerStatus({
+      collect,
+      name: musicInfo.name,
+      singer: musicInfo.singer,
+      albumName: musicInfo.album,
+      picUrl: musicInfo.pic ?? '',
+      lyric: musicInfo.lrc ?? '',
+      lyricLineText: '',
+    })
+  }
+  const handleSetLyric = () => {
+    sendPlayerStatus({
+      lyric: musicInfo.lrc ?? '',
+      lyricLineText: '',
+    })
+  }
+  const handleSetPic = () => {
+    sendPlayerStatus({
+      picUrl: musicInfo.pic ?? '',
+    })
+  }
+  const handleSetLyricLine = (text: string) => {
+    sendPlayerStatus({
+      lyricLineText: text,
     })
   }
   // const handleSetTaskbarThumbnailClip = (clip) => {
@@ -57,7 +67,7 @@ export default () => {
   // }
   const throttleListChange = throttle(async listIds => {
     if (!listIds.includes(loveList.id)) return
-    if (await updateCollectStatus()) setButtons()
+    if (await updateCollectStatus()) sendPlayerStatus({ collect })
   })
   // const updateSetting = () => {
   //   const setting = store.getters.setting
@@ -82,12 +92,12 @@ export default () => {
       case 'collect':
         if (!playMusicInfo.musicInfo) return
         void addListMusics(loveList.id, ['progress' in playMusicInfo.musicInfo ? playMusicInfo.musicInfo.metadata.musicInfo : playMusicInfo.musicInfo])
-        if (await updateCollectStatus()) setButtons()
+        if (await updateCollectStatus()) sendPlayerStatus({ collect })
         break
       case 'unCollect':
         if (!playMusicInfo.musicInfo) return
         void removeListMusics({ listId: loveList.id, ids: ['progress' in playMusicInfo.musicInfo ? playMusicInfo.musicInfo.metadata.musicInfo.id : playMusicInfo.musicInfo.id] })
-        if (await updateCollectStatus()) setButtons()
+        if (await updateCollectStatus()) sendPlayerStatus({ collect })
         break
       // case 'lrc':
       //   setVisibleDesktopLyric(true)
@@ -107,10 +117,24 @@ export default () => {
       //   break
     }
   })
+  watch(() => playProgress.nowPlayTime, (newValue, oldValue) => {
+    // console.log(playProgress.nowPlayTime, newValue, oldValue)
+    // if (newValue.toFixed(2) === oldValue.toFixed(2)) return
+    // console.log(playProgress.nowPlayTime)
+    sendPlayerStatus({ progress: newValue })
+  })
+  watch(() => playProgress.maxPlayTime, (newValue) => {
+    sendPlayerStatus({ duration: newValue })
+  })
+
   window.app_event.on('play', handlePlay)
   window.app_event.on('pause', handlePause)
   window.app_event.on('stop', handleStop)
+  window.app_event.on('error', handleError)
   window.app_event.on('musicToggled', handleSetPlayInfo)
+  window.app_event.on('lyricUpdated', handleSetLyric)
+  window.app_event.on('picUpdated', handleSetPic)
+  window.app_event.on('lyricLinePlay', handleSetLyricLine)
   // window.app_event.on(eventTaskbarNames.setTaskbarThumbnailClip, handleSetTaskbarThumbnailClip)
   window.app_event.on('myListUpdate', throttleListChange)
 
@@ -119,7 +143,11 @@ export default () => {
     window.app_event.off('play', handlePlay)
     window.app_event.off('pause', handlePause)
     window.app_event.off('stop', handleStop)
+    window.app_event.off('error', handleError)
     window.app_event.off('musicToggled', handleSetPlayInfo)
+    window.app_event.off('lyricUpdated', handleSetLyric)
+    window.app_event.off('picUpdated', handleSetPic)
+    window.app_event.off('lyricLinePlay', handleSetLyricLine)
     // window.app_event.off(eventTaskbarNames.setTaskbarThumbnailClip, handleSetTaskbarThumbnailClip)
     window.app_event.off('myListUpdate', throttleListChange)
   })
@@ -129,7 +157,14 @@ export default () => {
     // buttons.lrc = setting.desktopLyric.enable
     // buttons.lockLrc = setting.desktopLyric.isLock
     await updateCollectStatus()
-    if (playMusicInfo.musicInfo != null) buttons.empty = false
-    setButtons()
+    if (playMusicInfo.musicInfo == null) return
+    sendPlayerStatus({
+      collect,
+      name: musicInfo.name,
+      singer: musicInfo.singer,
+      albumName: musicInfo.album,
+      picUrl: musicInfo.pic ?? '',
+      lyric: musicInfo.lrc ?? '',
+    })
   }
 }

src/renderer/core/useApp/useSettingSync.ts

@@ -1,7 +1,7 @@
 import { watch } from '@common/utils/vueTools'
 import { isFullscreen, proxy, sync, windowSizeList } from '@renderer/store'
 import { appSetting } from '@renderer/store/setting'
-import { sendSyncAction, setTaskBarProgress, setWindowSize } from '@renderer/utils/ipc'
+import { sendSyncAction, setWindowSize } from '@renderer/utils/ipc'
 import { setLanguage } from '@root/lang'
 import { setUserApi } from '../apiSource'
 // import { applyTheme, getThemes } from '@renderer/store/utils'
@@ -106,11 +106,4 @@ export default () => {
   watch(() => appSetting['network.proxy.port'], port => {
     proxy.port = port
   })
-
-  watch(() => appSetting['player.isShowTaskProgess'], val => {
-    if (val) return
-    setTimeout(() => {
-      setTaskBarProgress(-1, 'normal')
-    })
-  })
 }