From 44366547697f3a83f9c47315220a56b958ee5d00 Mon Sep 17 00:00:00 2001 From: sunnylqm Date: Sun, 23 Feb 2025 17:26:59 +0800 Subject: [PATCH] fix class properties --- package.json | 2 +- src/client.ts | 66 +++++++++++++++++++++++------------------------- src/provider.tsx | 9 +++---- src/utils.ts | 20 +++++++++++++++ 4 files changed, 57 insertions(+), 40 deletions(-) diff --git a/package.json b/package.json index bcc6f0d..172b139 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "react-native-update", - "version": "10.24.1", + "version": "10.24.2", "description": "react-native hot update", "main": "src/index", "scripts": { diff --git a/src/client.ts b/src/client.ts index fd7b707..ff51429 100644 --- a/src/client.ts +++ b/src/client.ts @@ -1,5 +1,14 @@ import { CheckResult, ClientOptions, ProgressData, EventType } from './type'; -import { emptyObj, joinUrls, log, noop, promiseAny, testUrls } from './utils'; +import { + assertDev, + assertWeb, + emptyObj, + joinUrls, + log, + noop, + promiseAny, + testUrls, +} from './utils'; import { EmitterSubscription, Platform } from 'react-native'; import { PermissionsAndroid } from './permissions'; import { @@ -17,7 +26,7 @@ import { const SERVER_PRESETS = { // cn - pushy: { + Pushy: { main: 'https://update.react-native.cn/api', backups: ['https://update.reactnative.cn/api'], queryUrls: [ @@ -26,7 +35,7 @@ const SERVER_PRESETS = { ], }, // i18n - cresc: { + Cresc: { main: 'https://api.cresc.dev', backups: ['https://api.cresc.app'], queryUrls: [ @@ -34,11 +43,8 @@ const SERVER_PRESETS = { ], }, }; -if (Platform.OS === 'web') { - console.warn( - 'react-native-update does not support hot updates on the web platform and will not perform any operations', - ); -} + +assertWeb(); const defaultClientOptions: ClientOptions = { appKey: '', @@ -52,11 +58,8 @@ const defaultClientOptions: ClientOptions = { // for China users export class Pushy { - options: ClientOptions = { - ...defaultClientOptions, - server: SERVER_PRESETS.pushy, - }; - clientType: 'pushy' | 'cresc' = 'pushy'; + options = defaultClientOptions; + clientType: 'Pushy' | 'Cresc' = 'Pushy'; lastChecking?: number; lastRespJson?: Promise; @@ -85,6 +88,8 @@ export class Pushy { throw new Error('appKey is required'); } } + this.clientType = new.target.name as 'Pushy' | 'Cresc'; + this.options.server = SERVER_PRESETS[this.clientType]; this.setOptions(options); if (isRolledBack) { this.report({ @@ -150,6 +155,15 @@ export class Pushy { } return true; }; + assertDebug = () => { + if (__DEV__ && !this.options.debug) { + console.info( + 'You are currently in the development environment and have not enabled debug mode. The hot update check will not be performed. If you need to debug hot updates in the development environment, please set debug to true in the client.', + ); + return false; + } + return true; + }; markSuccess = () => { if (Pushy.marked || __DEV__ || !isFirstTime) { return; @@ -159,10 +173,7 @@ export class Pushy { this.report({ type: 'markSuccess' }); }; switchVersion = async (hash: string) => { - if (__DEV__) { - console.warn( - 'switchVersion() is not supported in development environment; no action taken.', - ); + if (!assertDev('switchVersion()')) { return; } if (Pushy.assertHash(hash) && !Pushy.applyingUpdate) { @@ -173,10 +184,7 @@ export class Pushy { }; switchVersionLater = async (hash: string) => { - if (__DEV__) { - console.warn( - 'switchVersionLater() is not supported in development environment; no action taken.', - ); + if (!assertDev('switchVersionLater()')) { return; } if (Pushy.assertHash(hash)) { @@ -185,14 +193,10 @@ export class Pushy { } }; checkUpdate = async (extra?: Record) => { - if (__DEV__ && !this.options.debug) { - console.info( - 'You are currently in the development environment and have not enabled debug mode. The hot update check will not be performed. If you need to debug hot updates in the development environment, please set debug to true in the client.', - ); + if (!this.assertDebug()) { return; } - if (Platform.OS === 'web') { - console.warn('web platform does not support hot update check'); + if (!assertWeb()) { return; } if ( @@ -508,10 +512,4 @@ export class Pushy { } // for international users -export class Cresc extends Pushy { - clientType: 'cresc' | 'pushy' = 'cresc'; - options: ClientOptions = { - ...defaultClientOptions, - server: SERVER_PRESETS.cresc, - }; -} +export class Cresc extends Pushy {} diff --git a/src/provider.tsx b/src/provider.tsx index aea31d2..6db7b73 100644 --- a/src/provider.tsx +++ b/src/provider.tsx @@ -27,7 +27,9 @@ export const UpdateProvider = ({ client: Pushy | Cresc; children: ReactNode; }) => { + client = useRef(client).current; const { options } = client; + const stateListener = useRef(); const [updateInfo, setUpdateInfo] = useState(); const updateInfoRef = useRef(updateInfo); @@ -239,10 +241,7 @@ export const UpdateProvider = ({ const markSuccess = client.markSuccess; useEffect(() => { - if (__DEV__ && !options.debug) { - console.info( - '您当前处于开发环境且未启用debug，不会进行热更检查。如需在开发环境中调试热更，请在client中设置debug为true', - ); + if (!client.assertDebug()) { return; } const { checkStrategy, dismissErrorAfter, autoMarkSuccess } = options; @@ -272,7 +271,7 @@ export const UpdateProvider = ({ stateListener.current && stateListener.current.remove(); clearTimeout(dismissErrorTimer); }; - }, [checkUpdate, options, dismissError, markSuccess]); + }, [checkUpdate, options, dismissError, markSuccess, client]); const parseTestPayload = useCallback( (payload: UpdateTestPayload) => { diff --git a/src/utils.ts b/src/utils.ts index 69c94b3..165cdd7 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -84,3 +84,23 @@ export const testUrls = async (urls?: string[]) => { log('all ping failed, use first url:', urls[0]); return urls[0]; }; + +export const assertWeb = () => { + if (Platform.OS === 'web') { + console.warn( + 'react-native-update does not support the Web platform and will not perform any operations', + ); + return false; + } + return true; +}; + +export const assertDev = (matter: string) => { + if (__DEV__) { + console.warn( + `${matter} is not supported in development environment; no action taken.`, + ); + return false; + } + return true; +};