15 Commits

Author SHA1 Message Date
Xin
7de3c135e4 Update package.json 2025-08-26 09:07:28 +08:00
Xin
9665ee3ba3 Merge pull request #179 from litecn/cokvr
refactor(api): simplify getResources method and update API endpoint `/api/search/resources`
2025-08-26 09:07:06 +08:00
James Chen
a53dde92eb refactor(api): simplify getResources method and update API endpoint /api/search/resources 2025-08-25 10:29:04 +08:00
zimplexing
e57466c8c1 refactor(logging): implement unified Logger system to replace console calls
- Add Logger utility with tagged output and environment-based control
- Configure Babel to remove console calls in production builds
- Replace all console.* calls across stores, services, and components with Logger
- Enable development-only logging with formatted output and component tags
- Optimize production builds by eliminating all logging code
2025-08-15 22:57:38 +08:00
zimplexing
836285dbd5 feat(player): enhance video playback with SSL error fallback and performance optimizations
- Add comprehensive SSL certificate error detection and automatic source switching
- Implement smart video source fallback strategy with failed source tracking
- Enhance video component with optimized event handlers and useCallback patterns
- Add explicit playAsync() call in onLoad to improve auto-play reliability
- Integrate performance monitoring with detailed logging throughout playback chain
- Optimize Video component props with useMemo and custom useVideoHandlers hook
- Add source matching fixes for fallback scenarios in DetailStore
- Enhance error handling with user-friendly messages and recovery strategies
2025-08-15 22:41:18 +08:00
zimplexing
172815f926 fix(update): append timestamp to GITHUB_RAW_URL for cache busting 2025-08-15 18:10:55 +08:00
Xin
e83f9d68fc Update package.json 2025-08-15 18:06:28 +08:00
Xin
04e0d0ac17 Update package.json 2025-08-15 18:05:43 +08:00
Xin
3e6bcb4920 Update package.json 2025-08-15 17:52:51 +08:00
zimplexing
6db0c5d888 fix(api): enhance SourceConfig filtering to ensure unique site entries and improve validation
fix(update): update GitHub URLs in UpdateConfig and bump version to 1.3.5
2025-08-15 17:24:42 +08:00
zimplexing
cfb3982611 fix(api): update getResources method to fetch from admin config and add safety checks for SourceConfig 2025-08-15 16:56:06 +08:00
zimplexing
7f0085361b chore(version): remove version field from app.json 2025-08-15 15:58:59 +08:00
zimplexing
3e3796ab5c fix(update): update GitHub URLs in UpdateConfig and bump version to 1.3.3 2025-08-15 15:53:49 +08:00
Xin
9fcdf4b5aa Update package.json 2025-08-15 15:25:17 +08:00
Xin
db7372d732 Merge pull request #143 from orion-lib/v1.3.2
feat(player): implement playback speed control with persistent settings
2025-08-15 15:24:04 +08:00
28 changed files with 1054 additions and 211 deletions

View File

@@ -36,7 +36,6 @@
},
"name": "OrionTV",
"slug": "OrionTV",
"version": "1.3.0",
"orientation": "default",
"icon": "./assets/images/icon.png",
"userInterfaceStyle": "dark",

View File

@@ -15,6 +15,9 @@ import { useUpdateStore, initUpdateStore } from "@/stores/updateStore";
import { UpdateModal } from "@/components/UpdateModal";
import { UPDATE_CONFIG } from "@/constants/UpdateConfig";
import { useResponsiveLayout } from "@/hooks/useResponsiveLayout";
import Logger from '@/utils/Logger';
const logger = Logger.withTag('RootLayout');
// Prevent the splash screen from auto-hiding before asset loading is complete.
SplashScreen.preventAutoHideAsync();
@@ -48,7 +51,7 @@ export default function RootLayout() {
if (loaded || error) {
SplashScreen.hideAsync();
if (error) {
console.warn(`Error in loading fonts: ${error}`);
logger.warn(`Error in loading fonts: ${error}`);
}
}
}, [loaded, error]);

View File

@@ -1,7 +1,7 @@
import React, { useEffect, useRef } from "react";
import React, { useEffect, useRef, useCallback, memo, useMemo } from "react";
import { StyleSheet, TouchableOpacity, BackHandler, AppState, AppStateStatus, View } from "react-native";
import { useLocalSearchParams, useRouter } from "expo-router";
import { Video, ResizeMode } from "expo-av";
import { Video } from "expo-av";
import { useKeepAwake } from "expo-keep-awake";
import { ThemedView } from "@/components/ThemedView";
import { PlayerControls } from "@/components/PlayerControls";
@@ -16,6 +16,58 @@ import { useTVRemoteHandler } from "@/hooks/useTVRemoteHandler";
import Toast from "react-native-toast-message";
import usePlayerStore, { selectCurrentEpisode } from "@/stores/playerStore";
import { useResponsiveLayout } from "@/hooks/useResponsiveLayout";
import { useVideoHandlers } from "@/hooks/useVideoHandlers";
import Logger from '@/utils/Logger';
const logger = Logger.withTag('PlayScreen');
// 优化的加载动画组件
const LoadingContainer = memo(
({ style, currentEpisode }: { style: any; currentEpisode: { url: string; title: string } | undefined }) => {
logger.info(
`[PERF] Video component NOT rendered - waiting for valid URL. currentEpisode: ${!!currentEpisode}, url: ${
currentEpisode?.url ? "exists" : "missing"
}`
);
return (
<View style={style}>
<VideoLoadingAnimation showProgressBar />
</View>
);
}
);
LoadingContainer.displayName = "LoadingContainer";
// 移到组件外部避免重复创建
const createResponsiveStyles = (deviceType: string) => {
const isMobile = deviceType === "mobile";
const isTablet = deviceType === "tablet";
return StyleSheet.create({
container: {
flex: 1,
backgroundColor: "black",
// 移动端和平板端可能需要状态栏处理
...(isMobile || isTablet ? { paddingTop: 0 } : {}),
},
videoContainer: {
...StyleSheet.absoluteFillObject,
// 为触摸设备添加更多的交互区域
...(isMobile || isTablet ? { zIndex: 1 } : {}),
},
videoPlayer: {
...StyleSheet.absoluteFillObject,
},
loadingContainer: {
...StyleSheet.absoluteFillObject,
backgroundColor: "rgba(0, 0, 0, 0.8)",
justifyContent: "center",
alignItems: "center",
zIndex: 10,
},
});
};
export default function PlayScreen() {
const videoRef = useRef<Video>(null);
@@ -61,17 +113,54 @@ export default function PlayScreen() {
} = usePlayerStore();
const currentEpisode = usePlayerStore(selectCurrentEpisode);
// 使用Video事件处理hook
const { videoProps } = useVideoHandlers({
videoRef,
currentEpisode,
initialPosition,
introEndTime,
playbackRate,
handlePlaybackStatusUpdate,
deviceType,
detail: detail || undefined,
});
// TV遥控器处理 - 总是调用hook但根据设备类型决定是否使用结果
const tvRemoteHandler = useTVRemoteHandler();
// 优化的动态样式 - 使用useMemo避免重复计算
const dynamicStyles = useMemo(() => createResponsiveStyles(deviceType), [deviceType]);
useEffect(() => {
const perfStart = performance.now();
logger.info(`[PERF] PlayScreen useEffect START - source: ${source}, id: ${id}, title: ${title}`);
setVideoRef(videoRef);
if (source && id && title) {
logger.info(`[PERF] Calling loadVideo with episodeIndex: ${episodeIndex}, position: ${position}`);
loadVideo({ source, id, episodeIndex, position, title });
} else {
logger.info(`[PERF] Missing required params - source: ${!!source}, id: ${!!id}, title: ${!!title}`);
}
const perfEnd = performance.now();
logger.info(`[PERF] PlayScreen useEffect END - took ${(perfEnd - perfStart).toFixed(2)}ms`);
return () => {
logger.info(`[PERF] PlayScreen unmounting - calling reset()`);
reset(); // Reset state when component unmounts
};
}, [episodeIndex, source, position, setVideoRef, reset, loadVideo, id, title]);
// 优化的屏幕点击处理
const onScreenPress = useCallback(() => {
if (deviceType === "tv") {
tvRemoteHandler.onScreenPress();
} else {
setShowControls(!showControls);
}
}, [deviceType, tvRemoteHandler, setShowControls, showControls]);
useEffect(() => {
const handleAppStateChange = (nextAppState: AppStateStatus) => {
if (nextAppState === "background" || nextAppState === "inactive") {
@@ -86,14 +175,6 @@ export default function PlayScreen() {
};
}, []);
// TV遥控器处理 - 总是调用hook但根据设备类型决定是否使用结果
const tvRemoteHandler = useTVRemoteHandler();
// 根据设备类型使用不同的交互处理
const onScreenPress = deviceType === 'tv'
? tvRemoteHandler.onScreenPress
: () => setShowControls(!showControls);
useEffect(() => {
const backAction = () => {
if (showControls) {
@@ -132,42 +213,29 @@ export default function PlayScreen() {
return <VideoLoadingAnimation showProgressBar />;
}
// 动态样式
const dynamicStyles = createResponsiveStyles(deviceType);
return (
<ThemedView focusable style={dynamicStyles.container}>
<TouchableOpacity
activeOpacity={1}
style={dynamicStyles.videoContainer}
<TouchableOpacity
activeOpacity={1}
style={dynamicStyles.videoContainer}
onPress={onScreenPress}
disabled={deviceType !== 'tv' && showControls} // 移动端和平板端在显示控制条时禁用触摸
disabled={deviceType !== "tv" && showControls} // 移动端和平板端在显示控制条时禁用触摸
>
<Video
ref={videoRef}
style={dynamicStyles.videoPlayer}
source={{ uri: currentEpisode?.url || "" }}
posterSource={{ uri: detail?.poster ?? "" }}
resizeMode={ResizeMode.CONTAIN}
rate={playbackRate}
onPlaybackStatusUpdate={handlePlaybackStatusUpdate}
onLoad={() => {
const jumpPosition = initialPosition || introEndTime || 0;
if (jumpPosition > 0) {
videoRef.current?.setPositionAsync(jumpPosition);
}
usePlayerStore.setState({ isLoading: false });
}}
onLoadStart={() => usePlayerStore.setState({ isLoading: true })}
useNativeControls={deviceType !== 'tv'}
shouldPlay
/>
{/* 条件渲染Video组件只有在有有效URL时才渲染 */}
{currentEpisode?.url ? (
<Video ref={videoRef} style={dynamicStyles.videoPlayer} {...videoProps} />
) : (
<LoadingContainer style={dynamicStyles.loadingContainer} currentEpisode={currentEpisode} />
)}
{showControls && deviceType === 'tv' && <PlayerControls showControls={showControls} setShowControls={setShowControls} />}
{showControls && deviceType === "tv" && (
<PlayerControls showControls={showControls} setShowControls={setShowControls} />
)}
<SeekingBar />
{isLoading && (
{/* 只在Video组件存在且正在加载时显示加载动画覆盖层 */}
{currentEpisode?.url && isLoading && (
<View style={dynamicStyles.loadingContainer}>
<VideoLoadingAnimation showProgressBar />
</View>
@@ -182,32 +250,3 @@ export default function PlayScreen() {
</ThemedView>
);
}
const createResponsiveStyles = (deviceType: string) => {
const isMobile = deviceType === 'mobile';
const isTablet = deviceType === 'tablet';
return StyleSheet.create({
container: {
flex: 1,
backgroundColor: "black",
// 移动端和平板端可能需要状态栏处理
...(isMobile || isTablet ? { paddingTop: 0 } : {}),
},
videoContainer: {
...StyleSheet.absoluteFillObject,
// 为触摸设备添加更多的交互区域
...(isMobile || isTablet ? { zIndex: 1 } : {}),
},
videoPlayer: {
...StyleSheet.absoluteFillObject,
},
loadingContainer: {
...StyleSheet.absoluteFillObject,
backgroundColor: 'rgba(0, 0, 0, 0.8)',
justifyContent: 'center',
alignItems: 'center',
zIndex: 10,
},
});
};

View File

@@ -18,6 +18,9 @@ import { getCommonResponsiveStyles } from "@/utils/ResponsiveStyles";
import ResponsiveNavigation from "@/components/navigation/ResponsiveNavigation";
import ResponsiveHeader from "@/components/navigation/ResponsiveHeader";
import { DeviceUtils } from "@/utils/DeviceUtils";
import Logger from '@/utils/Logger';
const logger = Logger.withTag('SearchScreen');
export default function SearchScreen() {
const [keyword, setKeyword] = useState("");
@@ -37,7 +40,7 @@ export default function SearchScreen() {
useEffect(() => {
if (lastMessage && targetPage === 'search') {
console.log("Received remote input:", lastMessage);
logger.debug("Received remote input:", lastMessage);
const realMessage = lastMessage.split("_")[0];
setKeyword(realMessage);
handleSearch(realMessage);
@@ -72,7 +75,7 @@ export default function SearchScreen() {
}
} catch (err) {
setError("搜索失败,请稍后重试。");
console.info("Search failed:", err);
logger.info("Search failed:", err);
} finally {
setLoading(false);
}

View File

@@ -1,7 +1,15 @@
module.exports = function (api) {
api.cache(true);
const plugins = [];
// 在生产环境移除console调用以优化性能
if (process.env.NODE_ENV === 'production') {
plugins.push('transform-remove-console');
}
return {
presets: ['babel-preset-expo'],
plugins: [],
plugins,
};
};

View File

@@ -8,6 +8,9 @@ import { ThemedText } from "@/components/ThemedText";
import { Colors } from "@/constants/Colors";
import { useResponsiveLayout } from "@/hooks/useResponsiveLayout";
import { DeviceUtils } from "@/utils/DeviceUtils";
import Logger from '@/utils/Logger';
const logger = Logger.withTag('ResponsiveVideoCard');
interface VideoCardProps extends React.ComponentProps<typeof TouchableOpacity> {
id: string;
@@ -138,7 +141,7 @@ const ResponsiveVideoCard = forwardRef<View, VideoCardProps>(
router.replace("/");
}
} catch (error) {
console.info("Failed to delete play record:", error);
logger.info("Failed to delete play record:", error);
Alert.alert("错误", "删除观看记录失败,请重试");
}
},

View File

@@ -3,13 +3,16 @@ import { View, Text, StyleSheet, Modal, FlatList } from "react-native";
import { StyledButton } from "./StyledButton";
import useDetailStore from "@/stores/detailStore";
import usePlayerStore from "@/stores/playerStore";
import Logger from '@/utils/Logger';
const logger = Logger.withTag('SourceSelectionModal');
export const SourceSelectionModal: React.FC = () => {
const { showSourceModal, setShowSourceModal, loadVideo, currentEpisodeIndex, status } = usePlayerStore();
const { searchResults, detail, setDetail } = useDetailStore();
const onSelectSource = (index: number) => {
console.log("onSelectSource", index, searchResults[index].source, detail?.source);
logger.debug("onSelectSource", index, searchResults[index].source, detail?.source);
if (searchResults[index].source !== detail?.source) {
const newDetail = searchResults[index];
setDetail(newDetail);

View File

@@ -8,6 +8,9 @@ import { ThemedText } from "@/components/ThemedText";
import { Colors } from "@/constants/Colors";
import { useResponsiveLayout } from "@/hooks/useResponsiveLayout";
import { DeviceUtils } from "@/utils/DeviceUtils";
import Logger from '@/utils/Logger';
const logger = Logger.withTag('VideoCardMobile');
interface VideoCardMobileProps extends React.ComponentProps<typeof TouchableOpacity> {
id: string;
@@ -97,7 +100,7 @@ const VideoCardMobile = forwardRef<View, VideoCardMobileProps>(
await PlayRecordManager.remove(source, id);
onRecordDeleted?.();
} catch (error) {
console.info("Failed to delete play record:", error);
logger.info("Failed to delete play record:", error);
Alert.alert("错误", "删除观看记录失败,请重试");
}
},

View File

@@ -8,6 +8,9 @@ import { ThemedText } from "@/components/ThemedText";
import { Colors } from "@/constants/Colors";
import { useResponsiveLayout } from "@/hooks/useResponsiveLayout";
import { DeviceUtils } from "@/utils/DeviceUtils";
import Logger from '@/utils/Logger';
const logger = Logger.withTag('VideoCardTablet');
interface VideoCardTabletProps extends React.ComponentProps<typeof TouchableOpacity> {
id: string;
@@ -119,7 +122,7 @@ const VideoCardTablet = forwardRef<View, VideoCardTabletProps>(
await PlayRecordManager.remove(source, id);
onRecordDeleted?.();
} catch (error) {
console.info("Failed to delete play record:", error);
logger.info("Failed to delete play record:", error);
Alert.alert("错误", "删除观看记录失败,请重试");
}
},

View File

@@ -6,6 +6,9 @@ import { PlayRecordManager } from "@/services/storage";
import { API } from "@/services/api";
import { ThemedText } from "@/components/ThemedText";
import { Colors } from "@/constants/Colors";
import Logger from '@/utils/Logger';
const logger = Logger.withTag('VideoCardTV');
interface VideoCardProps extends React.ComponentProps<typeof TouchableOpacity> {
id: string;
@@ -131,7 +134,7 @@ const VideoCard = forwardRef<View, VideoCardProps>(
router.replace("/");
}
} catch (error) {
console.info("Failed to delete play record:", error);
logger.info("Failed to delete play record:", error);
Alert.alert("错误", "删除观看记录失败,请重试");
}
},

View File

@@ -7,11 +7,11 @@ export const UPDATE_CONFIG = {
// GitHub相关URL
GITHUB_RAW_URL:
"https://gh-proxy.com/https://raw.githubusercontent.com/zimplexing/OrionTV/refs/heads/master/package.json",
`https://ghfast.top/https://raw.githubusercontent.com/orion-lib/OrionTV/refs/heads/master/package.json?t=${Date.now()}`,
// 获取平台特定的下载URL
getDownloadUrl(version: string): string {
return `https://gh-proxy.com/https://github.com/zimplexing/OrionTV/releases/download/v${version}/orionTV.${version}.apk`;
return `https://ghfast.top/https://github.com/orion-lib/OrionTV/releases/download/v${version}/orionTV.${version}.apk`;
},
// 是否显示更新日志

131
hooks/useVideoHandlers.ts Normal file
View File

@@ -0,0 +1,131 @@
import { useCallback, RefObject, useMemo } from 'react';
import { Video, ResizeMode } from 'expo-av';
import Toast from 'react-native-toast-message';
import usePlayerStore from '@/stores/playerStore';
interface UseVideoHandlersProps {
videoRef: RefObject<Video>;
currentEpisode: { url: string; title: string } | undefined;
initialPosition: number;
introEndTime?: number;
playbackRate: number;
handlePlaybackStatusUpdate: (status: any) => void;
deviceType: string;
detail?: { poster?: string };
}
export const useVideoHandlers = ({
videoRef,
currentEpisode,
initialPosition,
introEndTime,
playbackRate,
handlePlaybackStatusUpdate,
deviceType,
detail,
}: UseVideoHandlersProps) => {
const onLoad = useCallback(async () => {
console.info(`[PERF] Video onLoad - video ready to play`);
try {
// 1. 先设置位置(如果需要)
const jumpPosition = initialPosition || introEndTime || 0;
if (jumpPosition > 0) {
console.info(`[PERF] Setting initial position to ${jumpPosition}ms`);
await videoRef.current?.setPositionAsync(jumpPosition);
}
// 2. 显式调用播放以确保自动播放
console.info(`[AUTOPLAY] Attempting to start playback after onLoad`);
await videoRef.current?.playAsync();
console.info(`[AUTOPLAY] Auto-play successful after onLoad`);
usePlayerStore.setState({ isLoading: false });
console.info(`[PERF] Video loading complete - isLoading set to false`);
} catch (error) {
console.warn(`[AUTOPLAY] Failed to auto-play after onLoad:`, error);
// 即使自动播放失败,也要设置加载完成状态
usePlayerStore.setState({ isLoading: false });
// 不显示错误提示,因为自动播放失败是常见且预期的情况
}
}, [videoRef, initialPosition, introEndTime]);
const onLoadStart = useCallback(() => {
if (!currentEpisode?.url) return;
console.info(`[PERF] Video onLoadStart - starting to load video: ${currentEpisode.url.substring(0, 100)}...`);
usePlayerStore.setState({ isLoading: true });
}, [currentEpisode?.url]);
const onError = useCallback((error: any) => {
if (!currentEpisode?.url) return;
console.error(`[ERROR] Video playback error:`, error);
// 检测SSL证书错误和其他网络错误
const errorString = (error as any)?.error?.toString() || error?.toString() || '';
const isSSLError = errorString.includes('SSLHandshakeException') ||
errorString.includes('CertPathValidatorException') ||
errorString.includes('Trust anchor for certification path not found');
const isNetworkError = errorString.includes('HttpDataSourceException') ||
errorString.includes('IOException') ||
errorString.includes('SocketTimeoutException');
if (isSSLError) {
console.error(`[SSL_ERROR] SSL certificate validation failed for URL: ${currentEpisode.url}`);
Toast.show({
type: "error",
text1: "SSL证书错误正在尝试其他播放源...",
text2: "请稍候"
});
usePlayerStore.getState().handleVideoError('ssl', currentEpisode.url);
} else if (isNetworkError) {
console.error(`[NETWORK_ERROR] Network connection failed for URL: ${currentEpisode.url}`);
Toast.show({
type: "error",
text1: "网络连接失败,正在尝试其他播放源...",
text2: "请稍候"
});
usePlayerStore.getState().handleVideoError('network', currentEpisode.url);
} else {
console.error(`[VIDEO_ERROR] Other video error for URL: ${currentEpisode.url}`);
Toast.show({
type: "error",
text1: "视频播放失败,正在尝试其他播放源...",
text2: "请稍候"
});
usePlayerStore.getState().handleVideoError('other', currentEpisode.url);
}
}, [currentEpisode?.url]);
// 优化的Video组件props
const videoProps = useMemo(() => ({
source: { uri: currentEpisode?.url || '' },
posterSource: { uri: detail?.poster ?? "" },
resizeMode: ResizeMode.CONTAIN,
rate: playbackRate,
onPlaybackStatusUpdate: handlePlaybackStatusUpdate,
onLoad,
onLoadStart,
onError,
useNativeControls: deviceType !== 'tv',
shouldPlay: true,
}), [
currentEpisode?.url,
detail?.poster,
playbackRate,
handlePlaybackStatusUpdate,
onLoad,
onLoadStart,
onError,
deviceType,
]);
return {
onLoad,
onLoadStart,
onError,
videoProps,
};
};

View File

@@ -2,14 +2,14 @@
"name": "OrionTV",
"private": true,
"main": "expo-router/entry",
"version": "1.3.1",
"version": "1.3.7",
"scripts": {
"start": "EXPO_TV=1 EXPO_USE_METRO_WORKSPACE_ROOT=1 expo start",
"android": "EXPO_TV=1 EXPO_USE_METRO_WORKSPACE_ROOT=1 expo run:android",
"ios": "EXPO_TV=1 EXPO_USE_METRO_WORKSPACE_ROOT=1 expo run:ios",
"prebuild": "EXPO_TV=1 EXPO_USE_METRO_WORKSPACE_ROOT=1 expo prebuild --clean && yarn copy-config",
"copy-config": "cp -r xml/* android/app/src/*",
"build": "EXPO_TV=1 yarn prebuild && cd android && ./gradlew assembleRelease",
"build": "NODE_ENV=production EXPO_TV=1 yarn prebuild && cd android && ./gradlew assembleRelease",
"build-debug": "cd android && ./gradlew assembleDebug",
"test": "jest --watchAll",
"test-ci": "jest --ci --coverage --no-cache",
@@ -67,6 +67,7 @@
"@types/jest": "^29.5.12",
"@types/react": "~18.2.45",
"@types/react-test-renderer": "^18.0.7",
"babel-plugin-transform-remove-console": "^6.9.4",
"eslint": "^8.57.0",
"eslint-config-expo": "~7.1.2",
"jest": "^29.2.1",
@@ -82,4 +83,4 @@
}
},
"packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
}
}

View File

@@ -1,4 +1,3 @@
// region: --- Interface Definitions ---
export interface DoubanItem {
title: string;
@@ -204,7 +203,8 @@ export class API {
async searchVideo(query: string, resourceId: string, signal?: AbortSignal): Promise<{ results: SearchResult[] }> {
const url = `/api/search/one?q=${encodeURIComponent(query)}&resourceId=${encodeURIComponent(resourceId)}`;
const response = await this._fetch(url, { signal });
return response.json();
const { results } = await response.json();
return { results: results.filter((item: any) => item.title === query )};
}
async getResources(signal?: AbortSignal): Promise<ApiSite[]> {

View File

@@ -1,3 +1,7 @@
import Logger from '@/utils/Logger';
const logger = Logger.withTag('M3U');
export interface Channel {
id: string;
name: string;
@@ -59,7 +63,7 @@ export const fetchAndParseM3u = async (m3uUrl: string): Promise<Channel[]> => {
const m3uText = await response.text();
return parseM3U(m3uText);
} catch (error) {
console.info("Error fetching or parsing M3U:", error);
logger.info("Error fetching or parsing M3U:", error);
return []; // Return empty array on error
}
};

View File

@@ -1,3 +1,7 @@
import Logger from '@/utils/Logger';
const logger = Logger.withTag('M3U8');
interface CacheEntry {
resolution: string | null;
timestamp: number;
@@ -10,21 +14,33 @@ export const getResolutionFromM3U8 = async (
url: string,
signal?: AbortSignal
): Promise<string | null> => {
const perfStart = performance.now();
logger.info(`[PERF] M3U8 resolution detection START - url: ${url.substring(0, 100)}...`);
// 1. Check cache first
const cachedEntry = resolutionCache[url];
if (cachedEntry && Date.now() - cachedEntry.timestamp < CACHE_DURATION) {
const perfEnd = performance.now();
logger.info(`[PERF] M3U8 resolution detection CACHED - took ${(perfEnd - perfStart).toFixed(2)}ms, resolution: ${cachedEntry.resolution}`);
return cachedEntry.resolution;
}
if (!url.toLowerCase().endsWith(".m3u8")) {
logger.info(`[PERF] M3U8 resolution detection SKIPPED - not M3U8 file`);
return null;
}
try {
const fetchStart = performance.now();
const response = await fetch(url, { signal });
const fetchEnd = performance.now();
logger.info(`[PERF] M3U8 fetch took ${(fetchEnd - fetchStart).toFixed(2)}ms, status: ${response.status}`);
if (!response.ok) {
return null;
}
const parseStart = performance.now();
const playlist = await response.text();
const lines = playlist.split("\n");
let highestResolution = 0;
@@ -42,6 +58,9 @@ export const getResolutionFromM3U8 = async (
}
}
}
const parseEnd = performance.now();
logger.info(`[PERF] M3U8 parsing took ${(parseEnd - parseStart).toFixed(2)}ms, lines: ${lines.length}`);
// 2. Store result in cache
resolutionCache[url] = {
@@ -49,8 +68,13 @@ export const getResolutionFromM3U8 = async (
timestamp: Date.now(),
};
const perfEnd = performance.now();
logger.info(`[PERF] M3U8 resolution detection COMPLETE - took ${(perfEnd - perfStart).toFixed(2)}ms, resolution: ${resolutionString}`);
return resolutionString;
} catch {
} catch (error) {
const perfEnd = performance.now();
logger.info(`[PERF] M3U8 resolution detection ERROR - took ${(perfEnd - perfStart).toFixed(2)}ms, error: ${error}`);
return null;
}
};

View File

@@ -1,4 +1,7 @@
import TCPHttpServer from "./tcpHttpServer";
import Logger from '@/utils/Logger';
const logger = Logger.withTag('RemoteControl');
const getRemotePageHTML = () => {
return `
@@ -25,7 +28,7 @@ const getRemotePageHTML = () => {
</div>
<script>
window.addEventListener('DOMContentLoaded', () => {
fetch('/handshake', { method: 'POST' }).catch(console.info);
fetch('/handshake', { method: 'POST' }).catch(err => logger.info('Handshake failed:', err));
});
function send() {
const input = document.getElementById("text");
@@ -36,7 +39,7 @@ const getRemotePageHTML = () => {
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ message: value })
})
.catch(err => console.info(err));
.catch(err => logger.info('Message send failed:', err));
input.value = '';
}
}
@@ -58,7 +61,7 @@ class RemoteControlService {
private setupRequestHandler() {
this.httpServer.setRequestHandler((request) => {
console.log("[RemoteControl] Received request:", request.method, request.url);
logger.debug("[RemoteControl] Received request:", request.method, request.url);
try {
if (request.method === "GET" && request.url === "/") {
@@ -80,7 +83,7 @@ class RemoteControlService {
body: JSON.stringify({ status: "ok" }),
};
} catch (parseError) {
console.info("[RemoteControl] Failed to parse message body:", parseError);
logger.info("[RemoteControl] Failed to parse message body:", parseError);
return {
statusCode: 400,
headers: { "Content-Type": "application/json" },
@@ -102,7 +105,7 @@ class RemoteControlService {
};
}
} catch (error) {
console.info("[RemoteControl] Request handler error:", error);
logger.info("[RemoteControl] Request handler error:", error);
return {
statusCode: 500,
headers: { "Content-Type": "application/json" },
@@ -118,20 +121,20 @@ class RemoteControlService {
}
public async startServer(): Promise<string> {
console.log("[RemoteControl] Attempting to start server...");
logger.debug("[RemoteControl] Attempting to start server...");
try {
const url = await this.httpServer.start();
console.log(`[RemoteControl] Server started successfully at: ${url}`);
logger.debug(`[RemoteControl] Server started successfully at: ${url}`);
return url;
} catch (error) {
console.info("[RemoteControl] Failed to start server:", error);
logger.info("[RemoteControl] Failed to start server:", error);
throw new Error(error instanceof Error ? error.message : "Failed to start server");
}
}
public stopServer() {
console.log("[RemoteControl] Stopping server...");
logger.debug("[RemoteControl] Stopping server...");
this.httpServer.stop();
}

View File

@@ -1,6 +1,9 @@
import AsyncStorage from "@react-native-async-storage/async-storage";
import { api, PlayRecord as ApiPlayRecord, Favorite as ApiFavorite } from "./api";
import { storageConfig } from "./storageConfig";
import Logger from '@/utils/Logger';
const logger = Logger.withTag('Storage');
// --- Storage Keys ---
const STORAGE_KEYS = {
@@ -53,14 +56,22 @@ export class PlayerSettingsManager {
const data = await AsyncStorage.getItem(STORAGE_KEYS.PLAYER_SETTINGS);
return data ? JSON.parse(data) : {};
} catch (error) {
console.info("Failed to get all player settings:", error);
logger.info("Failed to get all player settings:", error);
return {};
}
}
static async get(source: string, id: string): Promise<PlayerSettings | null> {
const perfStart = performance.now();
logger.info(`[PERF] PlayerSettingsManager.get START - source: ${source}, id: ${id}`);
const allSettings = await this.getAll();
return allSettings[generateKey(source, id)] || null;
const result = allSettings[generateKey(source, id)] || null;
const perfEnd = performance.now();
logger.info(`[PERF] PlayerSettingsManager.get END - took ${(perfEnd - perfStart).toFixed(2)}ms, found: ${!!result}`);
return result;
}
static async save(source: string, id: string, settings: PlayerSettings): Promise<void> {
@@ -99,7 +110,7 @@ export class FavoriteManager {
const data = await AsyncStorage.getItem(STORAGE_KEYS.FAVORITES);
return data ? JSON.parse(data) : {};
} catch (error) {
console.info("Failed to get all local favorites:", error);
logger.info("Failed to get all local favorites:", error);
return {};
}
}
@@ -165,17 +176,27 @@ export class PlayRecordManager {
}
static async getAll(): Promise<Record<string, PlayRecord>> {
const perfStart = performance.now();
const storageType = this.getStorageType();
logger.info(`[PERF] PlayRecordManager.getAll START - storageType: ${storageType}`);
let apiRecords: Record<string, PlayRecord> = {};
if (this.getStorageType() === "localstorage") {
if (storageType === "localstorage") {
try {
const data = await AsyncStorage.getItem(STORAGE_KEYS.PLAY_RECORDS);
apiRecords = data ? JSON.parse(data) : {};
} catch (error) {
console.info("Failed to get all local play records:", error);
logger.info("Failed to get all local play records:", error);
return {};
}
} else {
const apiStart = performance.now();
logger.info(`[PERF] API getPlayRecords START`);
apiRecords = await api.getPlayRecords();
const apiEnd = performance.now();
logger.info(`[PERF] API getPlayRecords END - took ${(apiEnd - apiStart).toFixed(2)}ms, records: ${Object.keys(apiRecords).length}`);
}
const localSettings = await PlayerSettingsManager.getAll();
@@ -186,6 +207,10 @@ export class PlayRecordManager {
...localSettings[key],
};
}
const perfEnd = performance.now();
logger.info(`[PERF] PlayRecordManager.getAll END - took ${(perfEnd - perfStart).toFixed(2)}ms, total records: ${Object.keys(mergedRecords).length}`);
return mergedRecords;
}
@@ -207,9 +232,18 @@ export class PlayRecordManager {
}
static async get(source: string, id: string): Promise<PlayRecord | null> {
const perfStart = performance.now();
const key = generateKey(source, id);
const storageType = this.getStorageType();
logger.info(`[PERF] PlayRecordManager.get START - source: ${source}, id: ${id}, storageType: ${storageType}`);
const records = await this.getAll();
return records[key] || null;
const result = records[key] || null;
const perfEnd = performance.now();
logger.info(`[PERF] PlayRecordManager.get END - took ${(perfEnd - perfStart).toFixed(2)}ms, found: ${!!result}`);
return result;
}
static async remove(source: string, id: string): Promise<void> {
@@ -248,7 +282,7 @@ export class SearchHistoryManager {
const data = await AsyncStorage.getItem(STORAGE_KEYS.SEARCH_HISTORY);
return data ? JSON.parse(data) : [];
} catch (error) {
console.info("Failed to get local search history:", error);
logger.info("Failed to get local search history:", error);
return [];
}
}
@@ -293,7 +327,7 @@ export class SettingsManager {
const data = await AsyncStorage.getItem(STORAGE_KEYS.SETTINGS);
return data ? { ...defaultSettings, ...JSON.parse(data) } : defaultSettings;
} catch (error) {
console.info("Failed to get settings:", error);
logger.info("Failed to get settings:", error);
return defaultSettings;
}
}
@@ -316,7 +350,7 @@ export class LoginCredentialsManager {
const data = await AsyncStorage.getItem(STORAGE_KEYS.LOGIN_CREDENTIALS);
return data ? JSON.parse(data) : null;
} catch (error) {
console.info("Failed to get login credentials:", error);
logger.info("Failed to get login credentials:", error);
return null;
}
}
@@ -325,7 +359,7 @@ export class LoginCredentialsManager {
try {
await AsyncStorage.setItem(STORAGE_KEYS.LOGIN_CREDENTIALS, JSON.stringify(credentials));
} catch (error) {
console.error("Failed to save login credentials:", error);
logger.error("Failed to save login credentials:", error);
}
}
@@ -333,7 +367,7 @@ export class LoginCredentialsManager {
try {
await AsyncStorage.removeItem(STORAGE_KEYS.LOGIN_CREDENTIALS);
} catch (error) {
console.error("Failed to clear login credentials:", error);
logger.error("Failed to clear login credentials:", error);
}
}
}

View File

@@ -1,5 +1,8 @@
import TcpSocket from 'react-native-tcp-socket';
import NetInfo from '@react-native-community/netinfo';
import Logger from '@/utils/Logger';
const logger = Logger.withTag('TCPHttpServer');
const PORT = 12346;
@@ -59,7 +62,7 @@ class TCPHttpServer {
return { method, url, headers, body };
} catch (error) {
console.info('[TCPHttpServer] Error parsing HTTP request:', error);
logger.info('[TCPHttpServer] Error parsing HTTP request:', error);
return null;
}
}
@@ -108,14 +111,14 @@ class TCPHttpServer {
}
if (this.isRunning) {
console.log('[TCPHttpServer] Server is already running.');
logger.debug('[TCPHttpServer] Server is already running.');
return `http://${ipAddress}:${PORT}`;
}
return new Promise((resolve, reject) => {
try {
this.server = TcpSocket.createServer((socket: TcpSocket.Socket) => {
console.log('[TCPHttpServer] Client connected');
logger.debug('[TCPHttpServer] Client connected');
let requestData = '';
@@ -140,7 +143,7 @@ class TCPHttpServer {
socket.write(errorResponse);
}
} catch (error) {
console.info('[TCPHttpServer] Error handling request:', error);
logger.info('[TCPHttpServer] Error handling request:', error);
const errorResponse = this.formatHttpResponse({
statusCode: 500,
headers: { 'Content-Type': 'text/plain' },
@@ -155,28 +158,28 @@ class TCPHttpServer {
});
socket.on('error', (error: Error) => {
console.info('[TCPHttpServer] Socket error:', error);
logger.info('[TCPHttpServer] Socket error:', error);
});
socket.on('close', () => {
console.log('[TCPHttpServer] Client disconnected');
logger.debug('[TCPHttpServer] Client disconnected');
});
});
this.server.listen({ port: PORT, host: '0.0.0.0' }, () => {
console.log(`[TCPHttpServer] Server listening on ${ipAddress}:${PORT}`);
logger.debug(`[TCPHttpServer] Server listening on ${ipAddress}:${PORT}`);
this.isRunning = true;
resolve(`http://${ipAddress}:${PORT}`);
});
this.server.on('error', (error: Error) => {
console.info('[TCPHttpServer] Server error:', error);
logger.info('[TCPHttpServer] Server error:', error);
this.isRunning = false;
reject(error);
});
} catch (error) {
console.info('[TCPHttpServer] Failed to start server:', error);
logger.info('[TCPHttpServer] Failed to start server:', error);
reject(error);
}
});
@@ -187,7 +190,7 @@ class TCPHttpServer {
this.server.close();
this.server = null;
this.isRunning = false;
console.log('[TCPHttpServer] Server stopped');
logger.debug('[TCPHttpServer] Server stopped');
}
}

View File

@@ -3,6 +3,9 @@ import FileViewer from "react-native-file-viewer";
import Toast from "react-native-toast-message";
import { version as currentVersion } from "../package.json";
import { UPDATE_CONFIG } from "../constants/UpdateConfig";
import Logger from '@/utils/Logger';
const logger = Logger.withTag('UpdateService');
interface VersionInfo {
version: string;
@@ -47,7 +50,7 @@ class UpdateService {
};
} catch (error) {
retries++;
console.info(`Error checking version (attempt ${retries}/${maxRetries}):`, error);
logger.info(`Error checking version (attempt ${retries}/${maxRetries}):`, error);
if (retries === maxRetries) {
Toast.show({ type: "error", text1: "检查更新失败", text2: "无法获取版本信息,请检查网络连接" });
@@ -86,14 +89,14 @@ class UpdateService {
for (const file of filesToDelete) {
try {
await ReactNativeBlobUtil.fs.unlink(`${dirs.DocumentDir}/${file}`);
console.log(`Cleaned old APK file: ${file}`);
logger.debug(`Cleaned old APK file: ${file}`);
} catch (deleteError) {
console.warn(`Failed to delete old APK file ${file}:`, deleteError);
logger.warn(`Failed to delete old APK file ${file}:`, deleteError);
}
}
}
} catch (error) {
console.warn('Failed to clean old APK files:', error);
logger.warn('Failed to clean old APK files:', error);
}
}
@@ -138,11 +141,11 @@ class UpdateService {
}
const res = await task;
console.log(`APK downloaded successfully: ${filePath}`);
logger.debug(`APK downloaded successfully: ${filePath}`);
return res.path();
} catch (error) {
retries++;
console.info(`Error downloading APK (attempt ${retries}/${maxRetries}):`, error);
logger.info(`Error downloading APK (attempt ${retries}/${maxRetries}):`, error);
if (retries === maxRetries) {
Toast.show({ type: "error", text1: "下载失败", text2: "APK下载失败请检查网络连接" });
@@ -173,7 +176,7 @@ class UpdateService {
displayName: "OrionTV Update",
});
} catch (error) {
console.info("Error installing APK:", error);
logger.info("Error installing APK:", error);
// 提供更详细的错误信息
if (error instanceof Error) {

View File

@@ -3,6 +3,9 @@ import Cookies from "@react-native-cookies/cookies";
import { api } from "@/services/api";
import { useSettingsStore } from "./settingsStore";
import Toast from "react-native-toast-message";
import Logger from "@/utils/Logger";
const logger = Logger.withTag('AuthStore');
interface AuthState {
isLoggedIn: boolean;
@@ -69,7 +72,7 @@ const useAuthStore = create<AuthState>((set) => ({
}
}
} catch (error) {
console.info("Failed to check login status:", error);
logger.error("Failed to check login status:", error);
if (error instanceof Error && error.message === "UNAUTHORIZED") {
set({ isLoggedIn: false, isLoginModalVisible: true });
} else {
@@ -82,7 +85,7 @@ const useAuthStore = create<AuthState>((set) => ({
await Cookies.clearAll();
set({ isLoggedIn: false, isLoginModalVisible: true });
} catch (error) {
console.info("Failed to logout:", error);
logger.error("Failed to logout:", error);
}
},
}));

View File

@@ -3,6 +3,9 @@ import { SearchResult, api } from "@/services/api";
import { getResolutionFromM3U8 } from "@/services/m3u8";
import { useSettingsStore } from "@/stores/settingsStore";
import { FavoriteManager } from "@/services/storage";
import Logger from "@/utils/Logger";
const logger = Logger.withTag('DetailStore');
export type SearchResultWithResolution = SearchResult & { resolution?: string | null };
@@ -16,11 +19,14 @@ interface DetailState {
allSourcesLoaded: boolean;
controller: AbortController | null;
isFavorited: boolean;
failedSources: Set<string>; // 记录失败的source列表
init: (q: string, preferredSource?: string, id?: string) => Promise<void>;
setDetail: (detail: SearchResultWithResolution) => void;
setDetail: (detail: SearchResultWithResolution) => Promise<void>;
abort: () => void;
toggleFavorite: () => Promise<void>;
markSourceAsFailed: (source: string, reason: string) => void;
getNextAvailableSource: (currentSource: string, episodeIndex: number) => SearchResultWithResolution | null;
}
const useDetailStore = create<DetailState>((set, get) => ({
@@ -33,8 +39,12 @@ const useDetailStore = create<DetailState>((set, get) => ({
allSourcesLoaded: false,
controller: null,
isFavorited: false,
failedSources: new Set(),
init: async (q, preferredSource, id) => {
const perfStart = performance.now();
logger.info(`[PERF] DetailStore.init START - q: ${q}, preferredSource: ${preferredSource}, id: ${id}`);
const { controller: oldController } = get();
if (oldController) {
oldController.abort();
@@ -55,21 +65,30 @@ const useDetailStore = create<DetailState>((set, get) => ({
const { videoSource } = useSettingsStore.getState();
const processAndSetResults = async (results: SearchResult[], merge = false) => {
const resolutionStart = performance.now();
logger.info(`[PERF] Resolution detection START - processing ${results.length} sources`);
const resultsWithResolution = await Promise.all(
results.map(async (searchResult) => {
let resolution;
const m3u8Start = performance.now();
try {
if (searchResult.episodes && searchResult.episodes.length > 0) {
resolution = await getResolutionFromM3U8(searchResult.episodes[0], signal);
}
} catch (e) {
if ((e as Error).name !== "AbortError") {
console.info(`Failed to get resolution for ${searchResult.source_name}`, e);
logger.info(`Failed to get resolution for ${searchResult.source_name}`, e);
}
}
const m3u8End = performance.now();
logger.info(`[PERF] M3U8 resolution for ${searchResult.source_name}: ${(m3u8End - m3u8Start).toFixed(2)}ms (${resolution || 'failed'})`);
return { ...searchResult, resolution };
})
);
const resolutionEnd = performance.now();
logger.info(`[PERF] Resolution detection COMPLETE - took ${(resolutionEnd - resolutionStart).toFixed(2)}ms`);
if (signal.aborted) return;
@@ -93,59 +112,205 @@ const useDetailStore = create<DetailState>((set, get) => ({
try {
// Optimization for favorite navigation
if (preferredSource && id) {
const { results: preferredResult } = await api.searchVideo(q, preferredSource, signal);
const searchPreferredStart = performance.now();
logger.info(`[PERF] API searchVideo (preferred) START - source: ${preferredSource}, query: "${q}"`);
let preferredResult: SearchResult[] = [];
let preferredSearchError: any = null;
try {
const response = await api.searchVideo(q, preferredSource, signal);
preferredResult = response.results;
} catch (error) {
preferredSearchError = error;
logger.error(`[ERROR] API searchVideo (preferred) FAILED - source: ${preferredSource}, error:`, error);
}
const searchPreferredEnd = performance.now();
logger.info(`[PERF] API searchVideo (preferred) END - took ${(searchPreferredEnd - searchPreferredStart).toFixed(2)}ms, results: ${preferredResult.length}, error: ${!!preferredSearchError}`);
if (signal.aborted) return;
// 检查preferred source结果
if (preferredResult.length > 0) {
logger.info(`[SUCCESS] Preferred source "${preferredSource}" found ${preferredResult.length} results for "${q}"`);
await processAndSetResults(preferredResult, false);
set({ loading: false });
} else {
// 降级策略preferred source失败时立即尝试所有源
if (preferredSearchError) {
logger.warn(`[FALLBACK] Preferred source "${preferredSource}" failed with error, trying all sources immediately`);
} else {
logger.warn(`[FALLBACK] Preferred source "${preferredSource}" returned 0 results for "${q}", trying all sources immediately`);
}
// 立即尝试所有源,不再依赖后台搜索
const fallbackStart = performance.now();
logger.info(`[PERF] FALLBACK search (all sources) START - query: "${q}"`);
try {
const { results: allResults } = await api.searchVideos(q);
const fallbackEnd = performance.now();
logger.info(`[PERF] FALLBACK search END - took ${(fallbackEnd - fallbackStart).toFixed(2)}ms, total results: ${allResults.length}`);
const filteredResults = allResults.filter(item => item.title === q);
logger.info(`[FALLBACK] Filtered results: ${filteredResults.length} matches for "${q}"`);
if (filteredResults.length > 0) {
logger.info(`[SUCCESS] FALLBACK search found results, proceeding with ${filteredResults[0].source_name}`);
await processAndSetResults(filteredResults, false);
set({ loading: false });
} else {
logger.error(`[ERROR] FALLBACK search found no matching results for "${q}"`);
set({
error: `未找到 "${q}" 的播放源,请检查标题或稍后重试`,
loading: false
});
}
} catch (fallbackError) {
logger.error(`[ERROR] FALLBACK search FAILED:`, fallbackError);
set({
error: `搜索失败:${fallbackError instanceof Error ? fallbackError.message : '网络错误,请稍后重试'}`,
loading: false
});
}
}
// 后台搜索如果preferred source成功的话
if (preferredResult.length > 0) {
const searchAllStart = performance.now();
logger.info(`[PERF] API searchVideos (background) START`);
try {
const { results: allResults } = await api.searchVideos(q);
const searchAllEnd = performance.now();
logger.info(`[PERF] API searchVideos (background) END - took ${(searchAllEnd - searchAllStart).toFixed(2)}ms, results: ${allResults.length}`);
if (signal.aborted) return;
await processAndSetResults(allResults.filter(item => item.title === q), true);
} catch (backgroundError) {
logger.warn(`[WARN] Background search failed, but preferred source already succeeded:`, backgroundError);
}
}
// Then load all others in background
const { results: allResults } = await api.searchVideos(q);
if (signal.aborted) return;
await processAndSetResults(allResults, true);
} else {
// Standard navigation: fetch resources, then fetch details one by one
const allResources = await api.getResources(signal);
const enabledResources = videoSource.enabledAll
? allResources
: allResources.filter((r) => videoSource.sources[r.key]);
const resourcesStart = performance.now();
logger.info(`[PERF] API getResources START - query: "${q}"`);
try {
const allResources = await api.getResources(signal);
const resourcesEnd = performance.now();
logger.info(`[PERF] API getResources END - took ${(resourcesEnd - resourcesStart).toFixed(2)}ms, resources: ${allResources.length}`);
const enabledResources = videoSource.enabledAll
? allResources
: allResources.filter((r) => videoSource.sources[r.key]);
let firstResultFound = false;
const searchPromises = enabledResources.map(async (resource) => {
try {
const { results } = await api.searchVideo(q, resource.key, signal);
if (results.length > 0) {
await processAndSetResults(results, true);
if (!firstResultFound) {
set({ loading: false }); // Stop loading indicator on first result
firstResultFound = true;
}
}
} catch (error) {
console.info(`Failed to fetch from ${resource.name}:`, error);
logger.info(`[PERF] Enabled resources: ${enabledResources.length}/${allResources.length}`);
if (enabledResources.length === 0) {
logger.error(`[ERROR] No enabled resources available for search`);
set({
error: "没有可用的视频源,请检查设置或联系管理员",
loading: false
});
return;
}
});
await Promise.all(searchPromises);
let firstResultFound = false;
let totalResults = 0;
const searchPromises = enabledResources.map(async (resource) => {
try {
const searchStart = performance.now();
const { results } = await api.searchVideo(q, resource.key, signal);
const searchEnd = performance.now();
logger.info(`[PERF] API searchVideo (${resource.name}) took ${(searchEnd - searchStart).toFixed(2)}ms, results: ${results.length}`);
if (results.length > 0) {
totalResults += results.length;
logger.info(`[SUCCESS] Source "${resource.name}" found ${results.length} results for "${q}"`);
await processAndSetResults(results, true);
if (!firstResultFound) {
set({ loading: false }); // Stop loading indicator on first result
firstResultFound = true;
logger.info(`[SUCCESS] First result found from "${resource.name}", stopping loading indicator`);
}
} else {
logger.warn(`[WARN] Source "${resource.name}" returned 0 results for "${q}"`);
}
} catch (error) {
logger.error(`[ERROR] Failed to fetch from ${resource.name}:`, error);
}
});
await Promise.all(searchPromises);
// 检查是否找到任何结果
if (totalResults === 0) {
logger.error(`[ERROR] All sources returned 0 results for "${q}"`);
set({
error: `未找到 "${q}" 的播放源,请尝试其他关键词或稍后重试`,
loading: false
});
} else {
logger.info(`[SUCCESS] Standard search completed, total results: ${totalResults}`);
}
} catch (resourceError) {
logger.error(`[ERROR] Failed to get resources:`, resourceError);
set({
error: `获取视频源失败:${resourceError instanceof Error ? resourceError.message : '网络错误,请稍后重试'}`,
loading: false
});
return;
}
}
if (get().searchResults.length === 0) {
set({ error: "未找到任何播放源" });
const favoriteCheckStart = performance.now();
const finalState = get();
// 最终检查:如果所有搜索都完成但仍然没有结果
if (finalState.searchResults.length === 0 && !finalState.error) {
logger.error(`[ERROR] All search attempts completed but no results found for "${q}"`);
set({ error: `未找到 "${q}" 的播放源,请检查标题拼写或稍后重试` });
} else if (finalState.searchResults.length > 0) {
logger.info(`[SUCCESS] DetailStore.init completed successfully with ${finalState.searchResults.length} sources`);
}
if (get().detail) {
const { source, id } = get().detail!;
const isFavorited = await FavoriteManager.isFavorited(source, id.toString());
set({ isFavorited });
if (finalState.detail) {
const { source, id } = finalState.detail;
logger.info(`[INFO] Checking favorite status for source: ${source}, id: ${id}`);
try {
const isFavorited = await FavoriteManager.isFavorited(source, id.toString());
set({ isFavorited });
logger.info(`[INFO] Favorite status: ${isFavorited}`);
} catch (favoriteError) {
logger.warn(`[WARN] Failed to check favorite status:`, favoriteError);
}
} else {
logger.warn(`[WARN] No detail found after all search attempts for "${q}"`);
}
const favoriteCheckEnd = performance.now();
logger.info(`[PERF] Favorite check took ${(favoriteCheckEnd - favoriteCheckStart).toFixed(2)}ms`);
} catch (e) {
if ((e as Error).name !== "AbortError") {
set({ error: e instanceof Error ? e.message : "获取数据失败" });
logger.error(`[ERROR] DetailStore.init caught unexpected error:`, e);
const errorMessage = e instanceof Error ? e.message : "获取数据失败";
set({ error: `搜索失败:${errorMessage}` });
} else {
logger.info(`[INFO] DetailStore.init aborted by user`);
}
} finally {
if (!signal.aborted) {
set({ loading: false, allSourcesLoaded: true });
logger.info(`[INFO] DetailStore.init cleanup completed`);
}
const perfEnd = performance.now();
logger.info(`[PERF] DetailStore.init COMPLETE - total time: ${(perfEnd - perfStart).toFixed(2)}ms`);
}
},
@@ -178,6 +343,64 @@ const useDetailStore = create<DetailState>((set, get) => ({
const newIsFavorited = await FavoriteManager.toggle(source, id.toString(), favoriteItem);
set({ isFavorited: newIsFavorited });
},
markSourceAsFailed: (source: string, reason: string) => {
const { failedSources } = get();
const newFailedSources = new Set(failedSources);
newFailedSources.add(source);
logger.warn(`[SOURCE_FAILED] Marking source "${source}" as failed due to: ${reason}`);
logger.info(`[SOURCE_FAILED] Total failed sources: ${newFailedSources.size}`);
set({ failedSources: newFailedSources });
},
getNextAvailableSource: (currentSource: string, episodeIndex: number) => {
const { searchResults, failedSources } = get();
logger.info(`[SOURCE_SELECTION] Looking for alternative to "${currentSource}" for episode ${episodeIndex + 1}`);
logger.info(`[SOURCE_SELECTION] Failed sources: [${Array.from(failedSources).join(', ')}]`);
// 过滤掉当前source和已失败的sources
const availableSources = searchResults.filter(result =>
result.source !== currentSource &&
!failedSources.has(result.source) &&
result.episodes &&
result.episodes.length > episodeIndex
);
logger.info(`[SOURCE_SELECTION] Available sources: ${availableSources.length}`);
availableSources.forEach(source => {
logger.info(`[SOURCE_SELECTION] - ${source.source} (${source.source_name}): ${source.episodes?.length || 0} episodes`);
});
if (availableSources.length === 0) {
logger.error(`[SOURCE_SELECTION] No available sources for episode ${episodeIndex + 1}`);
return null;
}
// 优先选择有高分辨率的source
const sortedSources = availableSources.sort((a, b) => {
const aResolution = a.resolution || '';
const bResolution = b.resolution || '';
// 优先级: 1080p > 720p > 其他 > 无分辨率
const resolutionPriority = (res: string) => {
if (res.includes('1080')) return 4;
if (res.includes('720')) return 3;
if (res.includes('480')) return 2;
if (res.includes('360')) return 1;
return 0;
};
return resolutionPriority(bResolution) - resolutionPriority(aResolution);
});
const selectedSource = sortedSources[0];
logger.info(`[SOURCE_SELECTION] Selected fallback source: ${selectedSource.source} (${selectedSource.source_name}) with resolution: ${selectedSource.resolution || 'unknown'}`);
return selectedSource;
},
}));
export const sourcesSelector = (state: DetailState) => state.sources;

View File

@@ -4,6 +4,9 @@ import { AVPlaybackStatus, Video } from "expo-av";
import { RefObject } from "react";
import { PlayRecord, PlayRecordManager, PlayerSettingsManager } from "@/services/storage";
import useDetailStore, { episodesSelectorBySource } from "./detailStore";
import Logger from '@/utils/Logger';
const logger = Logger.withTag('PlayerStore');
interface Episode {
url: string;
@@ -54,6 +57,7 @@ interface PlayerState {
_isRecordSaveThrottled: boolean;
// Internal helper
_savePlayRecord: (updates?: Partial<PlayRecord>, options?: { immediate?: boolean }) => void;
handleVideoError: (errorType: 'ssl' | 'network' | 'other', failedUrl: string) => Promise<void>;
}
const usePlayerStore = create<PlayerState>((set, get) => ({
@@ -80,44 +84,156 @@ const usePlayerStore = create<PlayerState>((set, get) => ({
setVideoRef: (ref) => set({ videoRef: ref }),
loadVideo: async ({ source, id, episodeIndex, position, title }) => {
const perfStart = performance.now();
logger.info(`[PERF] PlayerStore.loadVideo START - source: ${source}, id: ${id}, title: ${title}`);
let detail = useDetailStore.getState().detail;
let episodes = episodesSelectorBySource(source)(useDetailStore.getState());
let episodes: string[] = [];
// 如果有detail使用detail的source获取episodes否则使用传入的source
if (detail && detail.source) {
logger.info(`[INFO] Using existing detail source "${detail.source}" to get episodes`);
episodes = episodesSelectorBySource(detail.source)(useDetailStore.getState());
} else {
logger.info(`[INFO] No existing detail, using provided source "${source}" to get episodes`);
episodes = episodesSelectorBySource(source)(useDetailStore.getState());
}
set({
isLoading: true,
});
if (!detail || !episodes || episodes.length === 0 || detail.title !== title) {
const needsDetailInit = !detail || !episodes || episodes.length === 0 || detail.title !== title;
logger.info(`[PERF] Detail check - needsInit: ${needsDetailInit}, hasDetail: ${!!detail}, episodesCount: ${episodes?.length || 0}`);
if (needsDetailInit) {
const detailInitStart = performance.now();
logger.info(`[PERF] DetailStore.init START - ${title}`);
await useDetailStore.getState().init(title, source, id);
const detailInitEnd = performance.now();
logger.info(`[PERF] DetailStore.init END - took ${(detailInitEnd - detailInitStart).toFixed(2)}ms`);
detail = useDetailStore.getState().detail;
episodes = episodesSelectorBySource(source)(useDetailStore.getState());
if (!detail) {
console.info("Detail not found after initialization");
logger.error(`[ERROR] Detail not found after initialization for "${title}" (source: ${source}, id: ${id})`);
// 检查DetailStore的错误状态
const detailStoreState = useDetailStore.getState();
if (detailStoreState.error) {
logger.error(`[ERROR] DetailStore error: ${detailStoreState.error}`);
set({
isLoading: false,
// 可以选择在这里设置一个错误状态但playerStore可能没有error字段
});
} else {
logger.error(`[ERROR] DetailStore init completed but no detail found and no error reported`);
set({ isLoading: false });
}
return;
}
// 使用DetailStore找到的实际source来获取episodes而不是原始的preferredSource
logger.info(`[INFO] Using actual source "${detail.source}" instead of preferred source "${source}"`);
episodes = episodesSelectorBySource(detail.source)(useDetailStore.getState());
if (!episodes || episodes.length === 0) {
logger.error(`[ERROR] No episodes found for "${title}" from source "${detail.source}" (${detail.source_name})`);
// 尝试从searchResults中直接获取episodes
const detailStoreState = useDetailStore.getState();
logger.info(`[INFO] Available sources in searchResults: ${detailStoreState.searchResults.map(r => `${r.source}(${r.episodes?.length || 0} episodes)`).join(', ')}`);
// 如果当前source没有episodes尝试使用第一个有episodes的source
const sourceWithEpisodes = detailStoreState.searchResults.find(r => r.episodes && r.episodes.length > 0);
if (sourceWithEpisodes) {
logger.info(`[FALLBACK] Using alternative source "${sourceWithEpisodes.source}" with ${sourceWithEpisodes.episodes.length} episodes`);
episodes = sourceWithEpisodes.episodes;
// 更新detail为有episodes的source
detail = sourceWithEpisodes;
} else {
logger.error(`[ERROR] No source with episodes found in searchResults`);
set({ isLoading: false });
return;
}
}
logger.info(`[SUCCESS] Detail and episodes loaded - source: ${detail.source_name}, episodes: ${episodes.length}`);
} else {
logger.info(`[PERF] Skipping DetailStore.init - using cached data`);
// 即使是缓存的数据也要确保使用正确的source获取episodes
if (detail && detail.source && detail.source !== source) {
logger.info(`[INFO] Cached detail source "${detail.source}" differs from provided source "${source}", updating episodes`);
episodes = episodesSelectorBySource(detail.source)(useDetailStore.getState());
if (!episodes || episodes.length === 0) {
logger.warn(`[WARN] Cached detail source "${detail.source}" has no episodes, trying provided source "${source}"`);
episodes = episodesSelectorBySource(source)(useDetailStore.getState());
}
}
}
// 最终验证确保我们有有效的detail和episodes数据
if (!detail) {
logger.error(`[ERROR] Final check failed: detail is null`);
set({ isLoading: false });
return;
}
if (!episodes || episodes.length === 0) {
logger.error(`[ERROR] Final check failed: no episodes available for source "${detail.source}" (${detail.source_name})`);
set({ isLoading: false });
return;
}
logger.info(`[SUCCESS] Final validation passed - detail: ${detail.source_name}, episodes: ${episodes.length}`);
try {
const playRecord = await PlayRecordManager.get(detail.source, detail.id.toString());
const playerSettings = await PlayerSettingsManager.get(detail.source, detail.id.toString());
const storageStart = performance.now();
logger.info(`[PERF] Storage operations START`);
const playRecord = await PlayRecordManager.get(detail!.source, detail!.id.toString());
const storagePlayRecordEnd = performance.now();
logger.info(`[PERF] PlayRecordManager.get took ${(storagePlayRecordEnd - storageStart).toFixed(2)}ms`);
const playerSettings = await PlayerSettingsManager.get(detail!.source, detail!.id.toString());
const storageEnd = performance.now();
logger.info(`[PERF] PlayerSettingsManager.get took ${(storageEnd - storagePlayRecordEnd).toFixed(2)}ms`);
logger.info(`[PERF] Total storage operations took ${(storageEnd - storageStart).toFixed(2)}ms`);
const initialPositionFromRecord = playRecord?.play_time ? playRecord.play_time * 1000 : 0;
const savedPlaybackRate = playerSettings?.playbackRate || 1.0;
const episodesMappingStart = performance.now();
const mappedEpisodes = episodes.map((ep, index) => ({
url: ep,
title: `${index + 1}`,
}));
const episodesMappingEnd = performance.now();
logger.info(`[PERF] Episodes mapping (${episodes.length} episodes) took ${(episodesMappingEnd - episodesMappingStart).toFixed(2)}ms`);
set({
isLoading: false,
currentEpisodeIndex: episodeIndex,
initialPosition: position || initialPositionFromRecord,
playbackRate: savedPlaybackRate,
episodes: episodes.map((ep, index) => ({
url: ep,
title: `${index + 1}`,
})),
episodes: mappedEpisodes,
introEndTime: playRecord?.introEndTime || playerSettings?.introEndTime,
outroStartTime: playRecord?.outroStartTime || playerSettings?.outroStartTime,
});
const perfEnd = performance.now();
logger.info(`[PERF] PlayerStore.loadVideo COMPLETE - total time: ${(perfEnd - perfStart).toFixed(2)}ms`);
} catch (error) {
console.info("Failed to load play record", error);
logger.debug("Failed to load play record", error);
set({ isLoading: false });
const perfEnd = performance.now();
logger.info(`[PERF] PlayerStore.loadVideo ERROR - total time: ${(perfEnd - perfStart).toFixed(2)}ms`);
}
},
@@ -134,7 +250,7 @@ const usePlayerStore = create<PlayerState>((set, get) => ({
try {
await videoRef?.current?.replayAsync();
} catch (error) {
console.info("Failed to replay video:", error);
logger.debug("Failed to replay video:", error);
Toast.show({ type: "error", text1: "播放失败" });
}
}
@@ -150,7 +266,7 @@ const usePlayerStore = create<PlayerState>((set, get) => ({
await videoRef?.current?.playAsync();
}
} catch (error) {
console.info("Failed to toggle play/pause:", error);
logger.debug("Failed to toggle play/pause:", error);
Toast.show({ type: "error", text1: "操作失败" });
}
}
@@ -164,7 +280,7 @@ const usePlayerStore = create<PlayerState>((set, get) => ({
try {
await videoRef?.current?.setPositionAsync(newPosition);
} catch (error) {
console.info("Failed to seek video:", error);
logger.debug("Failed to seek video:", error);
Toast.show({ type: "error", text1: "快进/快退失败" });
}
@@ -270,7 +386,7 @@ const usePlayerStore = create<PlayerState>((set, get) => ({
handlePlaybackStatusUpdate: (newStatus) => {
if (!newStatus.isLoaded) {
if (newStatus.error) {
console.info(`Playback Error: ${newStatus.error}`);
logger.debug(`Playback Error: ${newStatus.error}`);
}
set({ status: newStatus });
return;
@@ -331,7 +447,7 @@ const usePlayerStore = create<PlayerState>((set, get) => ({
await PlayerSettingsManager.save(detail.source, detail.id.toString(), { playbackRate: rate });
}
} catch (error) {
console.info("Failed to set playback rate:", error);
logger.debug("Failed to set playback rate:", error);
}
},
@@ -352,12 +468,105 @@ const usePlayerStore = create<PlayerState>((set, get) => ({
outroStartTime: undefined,
});
},
handleVideoError: async (errorType: 'ssl' | 'network' | 'other', failedUrl: string) => {
const perfStart = performance.now();
logger.error(`[VIDEO_ERROR] Handling ${errorType} error for URL: ${failedUrl}`);
const detailStoreState = useDetailStore.getState();
const { detail } = detailStoreState;
const { currentEpisodeIndex } = get();
if (!detail) {
logger.error(`[VIDEO_ERROR] Cannot fallback - no detail available`);
set({ isLoading: false });
return;
}
// 标记当前source为失败
const currentSource = detail.source;
const errorReason = `${errorType} error: ${failedUrl.substring(0, 100)}...`;
useDetailStore.getState().markSourceAsFailed(currentSource, errorReason);
// 获取下一个可用的source
const fallbackSource = useDetailStore.getState().getNextAvailableSource(currentSource, currentEpisodeIndex);
if (!fallbackSource) {
logger.error(`[VIDEO_ERROR] No fallback sources available for episode ${currentEpisodeIndex + 1}`);
Toast.show({
type: "error",
text1: "播放失败",
text2: "所有播放源都不可用,请稍后重试"
});
set({ isLoading: false });
return;
}
logger.info(`[VIDEO_ERROR] Switching to fallback source: ${fallbackSource.source} (${fallbackSource.source_name})`);
try {
// 更新DetailStore的当前detail为fallback source
await useDetailStore.getState().setDetail(fallbackSource);
// 重新加载当前集数的episodes
const newEpisodes = fallbackSource.episodes || [];
if (newEpisodes.length > currentEpisodeIndex) {
const mappedEpisodes = newEpisodes.map((ep, index) => ({
url: ep,
title: `${index + 1}`,
}));
set({
episodes: mappedEpisodes,
isLoading: false, // 让Video组件重新渲染
});
const perfEnd = performance.now();
logger.info(`[VIDEO_ERROR] Successfully switched to fallback source in ${(perfEnd - perfStart).toFixed(2)}ms`);
logger.info(`[VIDEO_ERROR] New episode URL: ${newEpisodes[currentEpisodeIndex].substring(0, 100)}...`);
Toast.show({
type: "success",
text1: "已切换播放源",
text2: `正在使用 ${fallbackSource.source_name}`
});
} else {
logger.error(`[VIDEO_ERROR] Fallback source doesn't have episode ${currentEpisodeIndex + 1}`);
set({ isLoading: false });
}
} catch (error) {
logger.error(`[VIDEO_ERROR] Failed to switch to fallback source:`, error);
set({ isLoading: false });
}
},
}));
export default usePlayerStore;
export const selectCurrentEpisode = (state: PlayerState) => {
if (state.episodes.length > state.currentEpisodeIndex) {
return state.episodes[state.currentEpisodeIndex];
// 增强数据安全性检查
if (
state.episodes &&
Array.isArray(state.episodes) &&
state.episodes.length > 0 &&
state.currentEpisodeIndex >= 0 &&
state.currentEpisodeIndex < state.episodes.length
) {
const episode = state.episodes[state.currentEpisodeIndex];
// 确保episode有有效的URL
if (episode && episode.url && episode.url.trim() !== "") {
return episode;
} else {
// 仅在调试模式下打印
if (__DEV__) {
logger.debug(`[PERF] selectCurrentEpisode - episode found but invalid URL: ${episode?.url}`);
}
}
} else {
// 仅在调试模式下打印
if (__DEV__) {
logger.debug(`[PERF] selectCurrentEpisode - no valid episode: episodes.length=${state.episodes?.length}, currentIndex=${state.currentEpisodeIndex}`);
}
}
return undefined;
};

View File

@@ -1,5 +1,8 @@
import { create } from 'zustand';
import { remoteControlService } from '@/services/remoteControlService';
import Logger from '@/utils/Logger';
const logger = Logger.withTag('RemoteControlStore');
interface RemoteControlState {
isServerRunning: boolean;
@@ -30,23 +33,23 @@ export const useRemoteControlStore = create<RemoteControlState>((set, get) => ({
}
remoteControlService.init({
onMessage: (message: string) => {
console.log('[RemoteControlStore] Received message:', message);
logger.debug('Received message:', message);
const currentState = get();
// Use the current targetPage from the store
set({ lastMessage: message, targetPage: currentState.targetPage });
},
onHandshake: () => {
console.log('[RemoteControlStore] Handshake successful');
logger.debug('Handshake successful');
set({ isModalVisible: false })
},
});
try {
const url = await remoteControlService.startServer();
console.log(`[RemoteControlStore] Server started, URL: ${url}`);
logger.info('Server started, URL:', url);
set({ isServerRunning: true, serverUrl: url, error: null });
} catch {
const errorMessage = '启动失败,请强制退应用后重试。';
console.info('[RemoteControlStore] Failed to start server:', errorMessage);
logger.error('Failed to start server:', errorMessage);
set({ error: errorMessage });
}
},

View File

@@ -2,6 +2,9 @@ import { create } from "zustand";
import { SettingsManager } from "@/services/storage";
import { api, ServerConfig } from "@/services/api";
import { storageConfig } from "@/services/storageConfig";
import Logger from "@/utils/Logger";
const logger = Logger.withTag('SettingsStore');
interface SettingsState {
apiBaseUrl: string;
@@ -65,7 +68,7 @@ export const useSettingsStore = create<SettingsState>((set, get) => ({
}
} catch (error) {
set({ serverConfig: null });
console.info("Failed to fetch server config:", error);
logger.error("Failed to fetch server config:", error);
} finally {
set({ isLoadingServerConfig: false });
}

View File

@@ -2,6 +2,9 @@ import { create } from 'zustand';
import updateService from '../services/updateService';
import AsyncStorage from '@react-native-async-storage/async-storage';
import Toast from 'react-native-toast-message';
import Logger from '@/utils/Logger';
const logger = Logger.withTag('UpdateStore');
interface UpdateState {
// 状态
@@ -151,7 +154,7 @@ export const useUpdateStore = create<UpdateState>((set, get) => ({
// 安装开始后,关闭弹窗
set({ showUpdateModal: false });
} catch (error) {
console.info('安装失败:', error);
logger.error('安装失败:', error);
set({
error: error instanceof Error ? error.message : '安装失败',
});
@@ -200,6 +203,6 @@ export const initUpdateStore = async () => {
skipVersion: skipVersion || null,
});
} catch (error) {
console.info('初始化更新存储失败:', error);
logger.error('初始化更新存储失败:', error);
}
};

149
utils/Logger.ts Normal file
View File

@@ -0,0 +1,149 @@
/**
* 统一日志管理器
* 在开发环境输出完整日志,生产环境移除所有日志代码
*/
export enum LogLevel {
DEBUG = 0,
INFO = 1,
WARN = 2,
ERROR = 3,
}
interface LoggerOptions {
tag?: string;
level?: LogLevel;
}
class LoggerClass {
private minLevel: LogLevel = LogLevel.DEBUG;
/**
* 设置最小日志级别
*/
setMinLevel(level: LogLevel): void {
if (__DEV__) {
this.minLevel = level;
}
}
/**
* 格式化日志输出
*/
private formatMessage(level: string, tag: string | undefined, message: any, ...args: any[]): void {
if (!__DEV__) return;
const timestamp = new Date().toISOString().substr(11, 12);
const prefix = tag ? `[${timestamp}][${level}][${tag}]` : `[${timestamp}][${level}]`;
switch (level) {
case 'DEBUG':
console.log(prefix, message, ...args);
break;
case 'INFO':
console.info(prefix, message, ...args);
break;
case 'WARN':
console.warn(prefix, message, ...args);
break;
case 'ERROR':
console.error(prefix, message, ...args);
break;
}
}
/**
* 调试级别日志
*/
debug(message: any, ...args: any[]): void;
debug(options: LoggerOptions, message: any, ...args: any[]): void;
debug(optionsOrMessage: LoggerOptions | any, message?: any, ...args: any[]): void {
if (!__DEV__) return;
if (this.minLevel > LogLevel.DEBUG) return;
if (typeof optionsOrMessage === 'object' && optionsOrMessage.tag !== undefined) {
const options = optionsOrMessage as LoggerOptions;
this.formatMessage('DEBUG', options.tag, message, ...args);
} else {
this.formatMessage('DEBUG', undefined, optionsOrMessage, message, ...args);
}
}
/**
* 信息级别日志
*/
info(message: any, ...args: any[]): void;
info(options: LoggerOptions, message: any, ...args: any[]): void;
info(optionsOrMessage: LoggerOptions | any, message?: any, ...args: any[]): void {
if (!__DEV__) return;
if (this.minLevel > LogLevel.INFO) return;
if (typeof optionsOrMessage === 'object' && optionsOrMessage.tag !== undefined) {
const options = optionsOrMessage as LoggerOptions;
this.formatMessage('INFO', options.tag, message, ...args);
} else {
this.formatMessage('INFO', undefined, optionsOrMessage, message, ...args);
}
}
/**
* 警告级别日志
*/
warn(message: any, ...args: any[]): void;
warn(options: LoggerOptions, message: any, ...args: any[]): void;
warn(optionsOrMessage: LoggerOptions | any, message?: any, ...args: any[]): void {
if (!__DEV__) return;
if (this.minLevel > LogLevel.WARN) return;
if (typeof optionsOrMessage === 'object' && optionsOrMessage.tag !== undefined) {
const options = optionsOrMessage as LoggerOptions;
this.formatMessage('WARN', options.tag, message, ...args);
} else {
this.formatMessage('WARN', undefined, optionsOrMessage, message, ...args);
}
}
/**
* 错误级别日志
*/
error(message: any, ...args: any[]): void;
error(options: LoggerOptions, message: any, ...args: any[]): void;
error(optionsOrMessage: LoggerOptions | any, message?: any, ...args: any[]): void {
if (!__DEV__) return;
if (this.minLevel > LogLevel.ERROR) return;
if (typeof optionsOrMessage === 'object' && optionsOrMessage.tag !== undefined) {
const options = optionsOrMessage as LoggerOptions;
this.formatMessage('ERROR', options.tag, message, ...args);
} else {
this.formatMessage('ERROR', undefined, optionsOrMessage, message, ...args);
}
}
/**
* 创建带标签的日志实例
*/
withTag(tag: string): LoggerClass {
const taggedLogger = new LoggerClass();
taggedLogger.minLevel = this.minLevel;
const originalDebug = taggedLogger.debug.bind(taggedLogger);
const originalInfo = taggedLogger.info.bind(taggedLogger);
const originalWarn = taggedLogger.warn.bind(taggedLogger);
const originalError = taggedLogger.error.bind(taggedLogger);
taggedLogger.debug = (message: any, ...args: any[]) => originalDebug({ tag }, message, ...args);
taggedLogger.info = (message: any, ...args: any[]) => originalInfo({ tag }, message, ...args);
taggedLogger.warn = (message: any, ...args: any[]) => originalWarn({ tag }, message, ...args);
taggedLogger.error = (message: any, ...args: any[]) => originalError({ tag }, message, ...args);
return taggedLogger;
}
}
export const Logger = new LoggerClass();
export default Logger;

View File

@@ -3064,6 +3064,11 @@ babel-plugin-transform-flow-enums@^0.0.2:
dependencies:
"@babel/plugin-syntax-flow" "^7.12.1"
babel-plugin-transform-remove-console@^6.9.4:
version "6.9.4"
resolved "https://registry.yarnpkg.com/babel-plugin-transform-remove-console/-/babel-plugin-transform-remove-console-6.9.4.tgz#b980360c067384e24b357a588d807d3c83527780"
integrity sha512-88blrUrMX3SPiGkT1GnvVY8E/7A+k6oj3MNvUtTIxJflFzXTw1bHkuJ/y039ouhFMp2prRn5cQGzokViYi1dsg==
babel-preset-current-node-syntax@^1.0.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.1.0.tgz#9a929eafece419612ef4ae4f60b1862ebad8ef30"
@@ -8827,16 +8832,7 @@ string-length@^5.0.1:
char-regex "^2.0.0"
strip-ansi "^7.0.1"
"string-width-cjs@npm:string-width@^4.2.0":
version "4.2.3"
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
dependencies:
emoji-regex "^8.0.0"
is-fullwidth-code-point "^3.0.0"
strip-ansi "^6.0.1"
string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
version "4.2.3"
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -8927,7 +8923,7 @@ string_decoder@~1.1.1:
dependencies:
safe-buffer "~5.1.0"
"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
version "6.0.1"
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -8941,13 +8937,6 @@ strip-ansi@^5.0.0, strip-ansi@^5.2.0:
dependencies:
ansi-regex "^4.1.0"
strip-ansi@^6.0.0, strip-ansi@^6.0.1:
version "6.0.1"
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
dependencies:
ansi-regex "^5.0.1"
strip-ansi@^7.0.1:
version "7.1.0"
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45"
@@ -9779,7 +9768,7 @@ word-wrap@^1.2.5:
resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34"
integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
version "7.0.0"
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
@@ -9797,15 +9786,6 @@ wrap-ansi@^6.2.0:
string-width "^4.1.0"
strip-ansi "^6.0.0"
wrap-ansi@^7.0.0:
version "7.0.0"
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
dependencies:
ansi-styles "^4.0.0"
string-width "^4.1.0"
strip-ansi "^6.0.0"
wrap-ansi@^8.1.0:
version "8.1.0"
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"