feat: auto skip failed resolves

lovegaoshi · May 31, 2024 · b2602b0 · b2602b0
1 parent 76adb3c
commit b2602b0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/src/azusa-player-mobile b/src/azusa-player-mobile
diff --git a/src/hooks/usePlayback.ts b/src/hooks/usePlayback.ts
@@ -13,6 +13,7 @@ import {
   initBiliHeartbeat,
 } from '../utils/Bilibili/BiliOperate';
 import { saveLastPlayDuration } from '../utils/ChromeStorage';
+import { DEFAULT_NULL_URL } from '@objects/Song';
 
 export default () => {
   const playerSetting = useNoxSetting((state) => state.playerSetting);
@@ -63,12 +64,14 @@ export default () => {
   const musicSrcParser = async (v: NoxMedia.Song) => {
     try {
       const resolvedUrl = await fetchPlayUrlPromise({ song: v });
-      // return currentAudioInst?.playNext?.();
+      if (resolvedUrl.url === DEFAULT_NULL_URL) {
+        throw new Error('resolve failed');
+      }
       parseR128Gain(v, async () => resolvedUrl);
       return resolvedUrl.url;
     } catch (e) {
-      console.error(`[resolveURL] failed to resolve ${v}: ${e}`);
-      // throw e;
+      console.error(`[resolveURL] failed to resolve ${v.bvid}: ${e}`);
+      setTimeout(() => currentAudioInst?.playNext?.(), 1000);
       return 'FAILED_TO_RESOLVE';
     }
   };
@@ -223,6 +226,7 @@ export default () => {
     _audioLists: NoxMedia.Song[],
     audioInfo: NoxMedia.Song,
   ) => {
+    // HACK: does this get called?
     console.error('audio error', errMsg, audioInfo);
     setTimeout(() => {
       // console.debug('retrying...');

diff --git a/src/styles/skins/aria.ts b/src/styles/skins/aria.ts
@@ -7,7 +7,6 @@ const { gifs, backgroundImagesLandscape } = APMSkins['塞克西废墟']!;
 export default () =>
   skinTemplate({
     playerBanner: PomeloTheme().playerBanner,
-    // playerBackground: async () => new Promise<string>((resolve) => { resolve('https://cdn.donmai.us/original/f5/cd/__watson_amelia_bubba_and_smol_ame_hololive_and_1_more_drawn_by_ro_g_oowack__f5cd65a11ff91b10f52aba05f46aa5e0.jpg'); }),
     playerBackground: backgroundImagesLandscape,
     gifs,
     appTitle: '电鱼播放器',
+1 −0		.eslintrc.js
+3 −2		package.json
+0 −1		src/components/buttons/LottieButtonReanimated.tsx
+1 −1		src/components/commonui/AutoComplete.tsx
+2 −2		src/components/player/Lyric.tsx
+1 −0		src/components/playlists/TimerDialog.tsx
+2 −2		src/components/setting/sync/useSync.ts
+1 −0		src/hooks/usePlaylist.ts
+2 −2		src/stores/wbi.ts
+2 −2		src/types/style.d.ts
+8 −6		src/types/util.d.ts
+2 −2		src/types/videoinfo.d.ts
+1 −1		src/utils/Bilibili/BiliUser.ts
+2 −1		src/utils/ChromeStorage.ts
+1 −1		src/utils/RNTPUtils.ts
+1 −1		src/utils/Utils.ts
+2 −0		src/utils/fs.ts
+1 −1		src/utils/mediafetch/local.ts
+2 −1		src/utils/mediafetch/resolveURL.ts
+2 −1		src/utils/sync/Dropbox.ts
+1 −0		src/utils/sync/Gitee.ts
+1 −0		src/utils/sync/Github.ts
+99 −18		yarn.lock