fix: update noop interval management

refs: IRIS-4216
zextras · May 3, 2023 · 819376c · 819376c
2 parents 40b05a1 + ea81c89
commit 819376c
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 22 deletions.
diff --git a/src/network/fetch.ts b/src/network/fetch.ts
@@ -18,7 +18,7 @@ import { report } from '../reporting';
 import { useAccountStore } from '../store/account';
 import { IS_STANDALONE, SHELL_APP_ID } from '../constants';
 import { useNetworkStore } from '../store/network';
-import { handleSync } from '../store/network/utils';
+import { getPollingInterval, handleSync } from '../store/network/utils';
 
 export const fetchNoOp = (): void => {
 	// eslint-disable-next-line @typescript-eslint/no-use-before-define
@@ -92,7 +92,7 @@ const normalizeContext = (context: any): SoapContext => {
 };
 
 const handleResponse = <R>(api: string, res: SoapResponse<R>): R | ErrorSoapBodyResponse => {
-	const { pollingInterval, noOpTimeout } = useNetworkStore.getState();
+	const { noOpTimeout } = useNetworkStore.getState();
 	const { usedQuota } = useAccountStore.getState();
 	clearTimeout(noOpTimeout);
 	if (res.Body.Fault) {
@@ -126,9 +126,8 @@ const handleResponse = <R>(api: string, res: SoapResponse<R>): R | ErrorSoapBody
 		useAccountStore.setState({
 			usedQuota: responseUsedQuota ?? usedQuota
 		});
-		const nextPollingInterval = (res?.Body as { waitDisallowed?: number })?.waitDisallowed
-			? 10000
-			: pollingInterval;
+
+		const nextPollingInterval = getPollingInterval(res);
 		useNetworkStore.setState({
 			noOpTimeout: setTimeout(() => fetchNoOp(), nextPollingInterval),
 			pollingInterval: nextPollingInterval,

diff --git a/src/network/get-info.ts b/src/network/get-info.ts
@@ -8,25 +8,11 @@ import { filter } from 'lodash';
 import { SHELL_APP_ID } from '../constants';
 import { useAppStore } from '../store/app';
 import { normalizeAccount } from '../store/account/normalization';
-import { AccountSettings, GetInfoResponse, CarbonioModule } from '../../types';
+import { GetInfoResponse, CarbonioModule } from '../../types';
 import { getSoapFetch } from './fetch';
 import { useAccountStore } from '../store/account';
 import { useNetworkStore } from '../store/network';
-
-const parsePollingInterval = (settings: AccountSettings): number => {
-	const pollingPref = (settings.prefs?.zimbraPrefMailPollingInterval ?? '') as string;
-	if (pollingPref === '500') {
-		return 500;
-	}
-	const pollingValue = parseInt(pollingPref, 10);
-	if (Number.isNaN(pollingValue)) {
-		return 30000;
-	}
-	if (pollingPref.includes('m')) {
-		return pollingValue * 60 * 1000;
-	}
-	return pollingValue * 1000;
-};
+import { parsePollingInterval } from '../store/network/utils';
 
 export const getInfo = (): Promise<void> =>
 	fetch('/static/iris/components.json')

diff --git a/src/store/network/utils.ts b/src/store/network/utils.ts
@@ -5,11 +5,62 @@
  */
 
 import { forEach } from 'lodash';
-import { SoapContext } from '../../../types';
+import { AccountSettings, SoapContext, SoapResponse } from '../../../types';
 import { folderWorker, tagWorker } from '../../workers';
 import { useFolderStore } from '../folder';
 import { useTagStore } from '../tags';
 import { useNetworkStore } from './store';
+import { useAccountStore } from '../account';
+
+/**
+ * Polling interval to use if the long polling delay
+ * is not allowed for the user
+ */
+const POLLING_NOWAIT_INTERVAL = 10_000;
+
+/**
+ * Polling interval to use if a previous request failed
+ * with a 500 error
+ */
+const POLLING_RETRY_INTERVAL = 60_000;
+
+export const parsePollingInterval = (settings: AccountSettings): number => {
+	const pollingPref = (settings.prefs?.zimbraPrefMailPollingInterval ?? '') as string;
+	if (pollingPref === '500') {
+		return 500;
+	}
+	const pollingValue = parseInt(pollingPref, 10);
+	if (Number.isNaN(pollingValue)) {
+		return 30000;
+	}
+	if (pollingPref.includes('m')) {
+		return pollingValue * 60 * 1000;
+	}
+	return pollingValue * 1000;
+};
+
+/**
+ * Return the polling interval for the next NoOp request.
+ * The interval length depends on the user settings, but it can be
+ * overridden by the server response/errors
+ * @param res
+ */
+export const getPollingInterval = <R>(res: SoapResponse<R>): number => {
+	const { pollingInterval } = useNetworkStore.getState();
+	const { settings } = useAccountStore.getState();
+	const waitDisallowed = (res?.Body as { waitDisallowed?: number })?.waitDisallowed;
+	const fault = res?.Body?.Fault;
+	if (fault) {
+		return POLLING_RETRY_INTERVAL;
+	}
+	if (waitDisallowed) {
+		return POLLING_NOWAIT_INTERVAL;
+	}
+	if (!fault) {
+		return parsePollingInterval(settings);
+	}
+	return pollingInterval;
+};
 
 export const handleSync = ({ refresh, notify }: SoapContext): Promise<void> =>
 	new Promise((r) => {