mirror/react-native-update
1
0
Fork 0
mirror of https://gitcode.com/gh_mirrors/re/react-native-pushy.git synced 2025-09-16 10:21:37 +08:00
Code Issues Packages Projects Releases Wiki Activity GitHub Gitee

fix throwIfEnabled

Browse Source
This commit is contained in:
Sunny Luo
2024-10-30 12:08:14 +08:00
committed by GitHub
parent 7d0e8398e9
commit 955834a98f
1 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/client.ts
View File

@@ -116,7 +116,11 @@ export class Pushy {
}, },
}); });
}; };
throwIfEnabled = (e: Error) => {
if (this.options.throwError) {
throw e;
}
};
getCheckUrl = (endpoint: string = this.options.server!.main) => { getCheckUrl = (endpoint: string = this.options.server!.main) => {
return `${endpoint}/checkUpdate/${this.options.appKey}`; return `${endpoint}/checkUpdate/${this.options.appKey}`;
}; };
@@ -231,7 +235,11 @@ export class Pushy {
fetch(this.getCheckUrl(endpoint), fetchPayload), fetch(this.getCheckUrl(endpoint), fetchPayload),
), ),
); );
} catch {} } catch (err: any) {
this.throwIfEnabled(new Error('errorCheckingUseBackup'));
}
} else {
this.throwIfEnabled(new Error('errorCheckingGetBackup'));
} }
} }
if (!resp) { if (!resp) {
@@ -239,6 +247,7 @@ export class Pushy {
type: 'errorChecking', type: 'errorChecking',
message: 'Can not connect to update server. Please check your network.', message: 'Can not connect to update server. Please check your network.',
}); });
this.throwIfEnabled(new Error('errorChecking'));
return this.lastRespJson ? await this.lastRespJson : empty; return this.lastRespJson ? await this.lastRespJson : empty;
} }
this.lastRespJson = resp.json(); this.lastRespJson = resp.json();
@@ -252,6 +261,7 @@ export class Pushy {
type: 'errorChecking', type: 'errorChecking',
message: result.message, message: result.message,
}); });
this.throwIfEnabled(new Error(result.message));
} }
return result; return result;
@@ -427,14 +437,21 @@ export class Pushy {
PermissionsAndroid.PERMISSIONS.WRITE_EXTERNAL_STORAGE, PermissionsAndroid.PERMISSIONS.WRITE_EXTERNAL_STORAGE,
); );
if (granted !== PermissionsAndroid.RESULTS.GRANTED) { if (granted !== PermissionsAndroid.RESULTS.GRANTED) {
return this.report({ type: 'rejectStoragePermission' }); this.report({ type: 'rejectStoragePermission' });
this.throwIfEnabled(new Error('rejectStoragePermission'));
return;
} }
} catch (e: any) { } catch (e: any) {
return this.report({ type: 'errorStoragePermission' }); this.report({ type: 'errorStoragePermission' });
this.throwIfEnabled(e);
return;
} }
} }
const progressKey = 'downloadingApk'; const progressKey = 'downloadingApk';
if (onDownloadProgress) { if (onDownloadProgress) {
if (this.progressHandlers[progressKey]) {
this.progressHandlers[progressKey].remove();
}
this.progressHandlers[progressKey] = pushyNativeEventEmitter.addListener( this.progressHandlers[progressKey] = pushyNativeEventEmitter.addListener(
'RCTPushyDownloadProgress', 'RCTPushyDownloadProgress',
(progressData: ProgressData) => { (progressData: ProgressData) => {
@@ -450,6 +467,7 @@ export class Pushy {
hash: progressKey, hash: progressKey,
}).catch(() => { }).catch(() => {
this.report({ type: 'errorDownloadAndInstallApk' }); this.report({ type: 'errorDownloadAndInstallApk' });
this.throwIfEnabled(new Error('errorDownloadAndInstallApk'));
}); });
if (this.progressHandlers[progressKey]) { if (this.progressHandlers[progressKey]) {
this.progressHandlers[progressKey].remove(); this.progressHandlers[progressKey].remove();