feat: mfsdk

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "MusicFreePlugins"]
-	path = MusicFreePlugins
-	url = https://github.com/maotoumao/MusicFreePlugins.git

src/components/playlist/BiliSearch/BiliSearchbar.tsx

@@ -10,7 +10,6 @@ import { useNoxSetting } from '@stores/useApp';
 import usePlayback from '@hooks/usePlayback';
 import useBiliSearch from '@hooks/useBiliSearch';
 import SearchMenu from './SearchMenu';
-import { getMusicFreePlugin } from '@utils/ChromeStorage';
 import logger from '@utils/Logger';
 import { getIcon } from './Icons';
 import AutoComplete from '@components/commonui/AutoComplete';
@@ -44,6 +43,7 @@ export default ({
   const playerSetting = useNoxSetting(state => state.playerSetting);
   const searchOption = useNoxSetting(state => state.searchOption);
   const searchProgress = useNoxSetting(state => state.searchBarProgress);
+  const mfsdks = useNoxSetting(state => state.MFsdks);
   const navigationGlobal = useNavigation();
   const externalSearchText = useNoxSetting(state => state.externalSearchText);
   const setExternalSearchText = useNoxSetting(
@@ -66,7 +66,7 @@ export default ({
   const pressed = useRef(false);
 
   const handleMenuPress = (event: GestureResponderEvent) => {
-    getMusicFreePlugin().then(v => setShowMusicFree(v.length > 0));
+    setShowMusicFree(mfsdks.length > 0);
     setDialogOpen(true);
     setMenuCoords({
       x: event.nativeEvent.pageX,

src/components/playlist/BiliSearch/SearchMenu.tsx

@@ -4,7 +4,6 @@ import { useTranslation } from 'react-i18next';
 
 import { SearchOptions } from '@enums/Storage';
 import useAlert from '@components/dialogs/useAlert';
-import { MUSICFREE } from '@utils/mediafetch/musicfree';
 import Icons from './Icons';
 import { useNoxSetting } from '@stores/useApp';
 import { rgb2Hex } from '@utils/Utils';
@@ -33,7 +32,7 @@ export default ({
   const { OneWayAlert } = useAlert();
   const playerStyle = useNoxSetting(state => state.playerStyle);
   const setSearchOption = useNoxSetting(state => state.setSearchOption);
-  const setDefaultSearch = (defaultSearch: SearchOptions | MUSICFREE) => {
+  const setDefaultSearch = (defaultSearch: SearchOptions) => {
     toggleVisible();
     setSearchOption(defaultSearch);
   };
@@ -74,8 +73,8 @@ export default ({
       {showMusicFree && (
         <Menu.Item
           leadingIcon={Icons.MUSICFREE}
-          onPress={() => setDefaultSearch(MUSICFREE.aggregated)}
-          title={`MusicFree.${MUSICFREE.aggregated}`}
+          onPress={() => setDefaultSearch(SearchOptions.MUSICFREE)}
+          title={`MusicFree.${SearchOptions.MUSICFREE}`}
         />
       )}
       {isAndroid && (

src/components/setting/developer/plugins/musicfree/View.tsx

@@ -17,7 +17,7 @@ interface ItemProps {
 const RenderItem = ({ sdk, listRef }: ItemProps) => {
   const playerStyle = useNoxSetting(state => state.playerStyle);
   const rmMFsdks = useNoxSetting(state => state.rmMFsdks);
-  const addMFsdks = useNoxSetting(state => state.addMFsdks);
+  const replaceMFsdks = useNoxSetting(state => state.replaceMFsdks);
 
   const deleteTheme = async () => {
     rmMFsdks([sdk]);
@@ -51,7 +51,7 @@ const RenderItem = ({ sdk, listRef }: ItemProps) => {
         <IconButton
           icon="sync"
           style={styles.deleteButton}
-          onPress={() => fetchMFsdk(sdk.srcUrl).then(addMFsdks)}
+          onPress={() => fetchMFsdk(sdk.srcUrl).then(replaceMFsdks)}
         />
         <IconButton
           icon="trash-can"

src/enums/Storage.ts

@@ -20,7 +20,6 @@ export enum StorageKeys {
   FADE_INTERVAL = 'fadeInterval',
   COLORTHEME = 'ColorTheme',
   REGEXTRACT_MAPPING = 'RegexExtract',
-  MUSICFREE_PLUGIN = 'MusicFreePlugin',
   AA_PERMISSION = 'AndroidAutoPermission',
   TANAKA_AMAZING_COMMODITIES = 'TanakaAmazingCommodities',
   ALIST_CRED = 'AlistCred',
@@ -35,4 +34,5 @@ export enum SearchOptions {
   YOUTUBE = 'youtube',
   YOUTUBEM = 'yt music',
   ALIST = 'alist',
+  MUSICFREE = 'musicfree',
 }

src/objects/Song.ts

@@ -4,7 +4,6 @@ import he from 'he';
 import { extractParenthesis } from '../utils/re';
 import { reExtractSongName } from '@stores/regexStore';
 import { Source } from '@enums/MediaFetch';
-import { MUSICFREE } from '@utils/mediafetch/musicfree';
 import { i0hdslbHTTPResolve } from '@utils/Utils';
 
 export const DEFAULT_NULL_URL = 'NULL';
@@ -26,7 +25,7 @@ interface SongProps {
   duration?: number;
   album?: string;
   addedDate?: number;
-  source?: Source | MUSICFREE;
+  source?: Source;
   isLive?: boolean;
   liveStatus?: boolean;
   metadataOnLoad?: boolean;

src/stores/useAPMUI.ts

@@ -1,7 +1,6 @@
 import { StateCreator } from 'zustand';
 
 import { IntentData } from '@enums/Intent';
-import { MUSICFREE } from '@utils/mediafetch/musicfree';
 import { SearchOptions } from '@enums/Storage';
 import { saveDefaultSearch } from '@utils/ChromeStorage';
 
@@ -14,8 +13,8 @@ export interface APMUIStore {
 
   intentData?: IntentData;
   setIntentData: (val?: IntentData) => void;
-  searchOption: SearchOptions | MUSICFREE;
-  setSearchOption: (val: SearchOptions | MUSICFREE) => void;
+  searchOption: SearchOptions;
+  setSearchOption: (val: SearchOptions) => void;
   gestureMode: boolean;
   setGestureMode: (val: boolean) => void;
 

src/stores/useMFsdk.ts

@@ -9,11 +9,18 @@ export interface MFsdkStore {
   setMFsdks: (mf: MFsdk[]) => void;
   addMFsdks: (mf: MFsdk[]) => void;
   rmMFsdks: (mf: MFsdk[]) => void;
+  replaceMFsdks: (mf: MFsdk[]) => void;
 }
 
 const store: StateCreator<MFsdkStore, [], [], MFsdkStore> = (set, get) => ({
   MFsdks: [],
   setMFsdks: mf => set({ MFsdks: mf }),
+  replaceMFsdks: mf => {
+    if (mf.length === 0) return;
+    set(s => ({
+      MFsdks: s.MFsdks.map(sdk => mf.find(v => v.srcUrl === sdk.srcUrl) ?? sdk),
+    }));
+  },
   addMFsdks: mf => {
     if (mf.length === 0) return;
     addMFsdks(mf.map(v => v.path));

src/types/media.d.ts

@@ -1,11 +1,10 @@
 import { SortOptions, PlaylistTypes } from '@enums/Playlist';
 import { Source } from '@enums/MediaFetch';
-import { MUSICFREE } from '@utils/mediafetch/musicfree';
 import { LrcSource } from '@enums/LyricFetch';
 
 declare global {
   namespace NoxMedia {
-    type SongSource = Source | MUSICFREE;
+    type SongSource = Source;
 
     export interface Song {
       id: string;

src/utils/BiliSearch.ts

@@ -1,8 +1,6 @@
 import biliSearchFetch from '@utils/mediafetch/bilisearch';
 import ytbVideoFetch from '@utils/mediafetch/ytbvideo';
 import localFetch from '@utils/mediafetch/local';
-import { MUSICFREE, searcher } from '@utils/mediafetch/musicfree';
-import { getMusicFreePlugin } from '@utils/ChromeStorage';
 import { SearchOptions } from '@enums/Storage';
 import steriatkFetch from './mediafetch/steriatk';
 import biliVideoSimilarFetch from './mediafetch/biliVideoSimilar';
@@ -35,6 +33,7 @@ import biliFavColleFetch from './mediafetch/biliFavColle';
 import alistFetch from './mediafetch/alist';
 import acfunFetch from './mediafetch/acfunvideo';
 import { logger } from './Logger';
+import { useNoxSetting } from '@stores/useApp';
 
 /**
  * assign the proper extractor based on the provided url. uses regex.
@@ -47,7 +46,7 @@ interface Props {
   useBiliTag?: boolean;
   fastSearch?: boolean;
   cookiedSearch?: boolean;
-  defaultSearch?: SearchOptions | MUSICFREE;
+  defaultSearch?: SearchOptions;
   genericSearch?: boolean;
 }
 
@@ -129,12 +128,15 @@ export const searchBiliURLs = async ({
         case SearchOptions.YOUTUBEM:
           results = { songList: await fetchInnerTuneSearch(input) };
           break;
-        case MUSICFREE.aggregated:
-          results.songList = await searcher[MUSICFREE.aggregated](
-            input,
-            await getMusicFreePlugin(),
+        case SearchOptions.MUSICFREE: {
+          const songLists = await Promise.all(
+            useNoxSetting
+              .getState()
+              .MFsdks.map(sdk => sdk.regexFetch({ url: input })),
           );
+          results.songList = songLists.map(v => v.songList).flat();
           break;
+        }
         default:
           results = await biliSearchFetch.regexFetch({
             url: input,

src/utils/ChromeStorage.ts

@@ -20,16 +20,9 @@ import { NoxRepeatMode } from '@enums/RepeatMode';
 import { PlaylistTypes } from '@enums/Playlist';
 import { StorageKeys, SearchOptions } from '@enums/Storage';
 import { DefaultSetting, OverrideSetting } from '@objects/Storage';
-import { MUSICFREE } from '@utils/mediafetch/musicfree';
 import { getAlistCred } from './alist/storage';
 import { timeFunction } from './Utils';
 
-export const setMusicFreePlugin = (val: MUSICFREE[]) =>
-  saveItem(StorageKeys.MUSICFREE_PLUGIN, val);
-
-export const getMusicFreePlugin = (): Promise<MUSICFREE[]> =>
-  getItem(StorageKeys.MUSICFREE_PLUGIN, []);
-
 export const getFadeInterval = async () =>
   Number(await getItem(StorageKeys.FADE_INTERVAL)) || 0;
 
@@ -60,7 +53,7 @@ export const saveABMapping = async (val: NoxStorage.ABDict) =>
 export const getDefaultSearch = (): Promise<SearchOptions> =>
   getItem(StorageKeys.DEFAULT_SEARCH, SearchOptions.BILIBILI);
 
-export const saveDefaultSearch = (val: SearchOptions | MUSICFREE) =>
+export const saveDefaultSearch = (val: SearchOptions) =>
   saveItem(StorageKeys.DEFAULT_SEARCH, val);
 
 export const getCachedMediaMapping = () =>

src/utils/mediafetch/evalsdk.ts

@@ -7,6 +7,7 @@ import * as cheerio from 'cheerio';
 import CookieManager from '@react-native-cookies/cookies';
 import he from 'he';
 import { URL } from 'react-native-url-polyfill';
+import logger from '../Logger';
 
 const Qualities = ['super', 'high', 'standard', 'low'];
 
@@ -17,9 +18,7 @@ export interface MFsdk {
   author: string;
   srcUrl: string;
   supportedSearchType: string[];
-  regexFetch: (
-    v: NoxNetwork.BiliSearchFetchProps,
-  ) => Promise<NoxNetwork.NoxRegexFetch>;
+  regexFetch: (v: { url: string }) => Promise<NoxNetwork.NoxRegexFetch>;
   resolveURL: (v: NoxMedia.Song) => Promise<NoxNetwork.ParsedNoxMediaURL>;
   /*
   search: [AsyncFunction: search],
@@ -46,25 +45,29 @@ const IMusicToNoxMedia = (val: IMusic.IMusicItem, source: string) => {
     singer: val.artist,
     singerId: val.id,
     cover:
-      val.artwork ||
+      val.artwork ??
       'https://i2.hdslb.com/bfs/face/b70f6e62e4582d4fa5d48d86047e64eb57d7504e.jpg',
     lyric: val.lrc,
     parsedName: val.title,
     source,
-    duration: val.duration | 0,
+    duration: val.duration ?? 0,
   } as NoxMedia.Song;
 };
 
 const searchWrapper =
   (search: (s: string, p: number, t: string) => any, sdk: MFsdk) =>
-  async (
-    v: NoxNetwork.BiliSearchFetchProps,
-  ): Promise<NoxNetwork.NoxRegexFetch> => {
-    const results = await search(v.url, 1, 'music');
-    const songList = results.data.map((iMusic: any) =>
-      IMusicToNoxMedia(iMusic, sdk.platform),
-    );
-    return { songList };
+  async (v: { url: string }): Promise<NoxNetwork.NoxRegexFetch> => {
+    try {
+      logger.debug(`[mfsdk][${sdk.platform}] searching ${v.url}`);
+      const results = await search(v.url, 1, 'music');
+      const songList = results.data.map((iMusic: any) =>
+        IMusicToNoxMedia(iMusic, sdk.platform),
+      );
+      return { songList };
+    } catch {
+      logger.debug(`[mfsdk][${sdk.platform}] failed to search.`);
+      return { songList: [] };
+    }
   };
 
 const resolveURLWrapper =
@@ -76,6 +79,9 @@ const resolveURLWrapper =
     for (const quality of qualities) {
       const res = await resolveURL(v, quality);
       if (res) {
+        logger.debug(
+          `[mfsdk][${sdk.platform}] resolved ${v.name} with quality ${quality}`,
+        );
         return res;
       }
     }