@zextras/carbonio-shell-ui 8.0.3-devel.1729235939785 → 8.0.3-devel.1730296979281
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/network/fetch.d.ts +8 -1
- package/lib/network/fetch.js +2 -3
- package/lib/network/fetch.js.map +1 -1
- package/lib/store/network/utils.d.ts +2 -1
- package/lib/store/network/utils.js +18 -8
- package/lib/store/network/utils.js.map +1 -1
- package/lib/types/network/index.d.ts +0 -3
- package/lib/types/network/soap.d.ts +4 -0
- package/package.json +1 -1
package/lib/network/fetch.d.ts
CHANGED
|
@@ -1,4 +1,11 @@
|
|
|
1
|
-
|
|
1
|
+
import type { SoapBody } from '../types/network';
|
|
2
|
+
export type NoOpRequest = SoapBody<{
|
|
3
|
+
limitToOneBlocked?: 0 | 1;
|
|
4
|
+
wait?: 0 | 1;
|
|
5
|
+
}>;
|
|
6
|
+
export type NoOpResponse = SoapBody<{
|
|
7
|
+
waitDisallowed?: boolean;
|
|
8
|
+
}>;
|
|
2
9
|
export declare const getSoapFetch: (app: string) => <Request_1, Response_1 extends Record<string, unknown>>(api: string, body: Request_1, otherAccount?: string, signal?: AbortSignal) => Promise<Response_1>;
|
|
3
10
|
export declare const getXmlSoapFetch: (app: string) => <Request_1, Response_1 extends Record<string, unknown>>(api: string, body: Request_1, otherAccount?: string) => Promise<Response_1>;
|
|
4
11
|
export declare const shellSoap: <Request_1, Response_1 extends Record<string, unknown>>(api: string, body: Request_1, otherAccount?: string, signal?: AbortSignal) => Promise<Response_1>;
|
package/lib/network/fetch.js
CHANGED
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
* SPDX-License-Identifier: AGPL-3.0-only
|
|
6
6
|
*/
|
|
7
7
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
8
|
-
exports.shellSoap = exports.getXmlSoapFetch = exports.getSoapFetch =
|
|
8
|
+
exports.shellSoap = exports.getXmlSoapFetch = exports.getSoapFetch = void 0;
|
|
9
9
|
const lodash_1 = require("lodash");
|
|
10
10
|
const fetch_utils_1 = require("./fetch-utils");
|
|
11
11
|
const user_agent_1 = require("./user-agent");
|
|
@@ -21,7 +21,6 @@ const fetchNoOp = () => {
|
|
|
21
21
|
? { _jsns: constants_1.JSNS.mail, limitToOneBlocked: 1, wait: 1 }
|
|
22
22
|
: { _jsns: constants_1.JSNS.mail });
|
|
23
23
|
};
|
|
24
|
-
exports.fetchNoOp = fetchNoOp;
|
|
25
24
|
const getXmlAccount = (acc, otherAccount) => {
|
|
26
25
|
if (otherAccount) {
|
|
27
26
|
return `<account by="name">${otherAccount}</account>`;
|
|
@@ -79,7 +78,7 @@ const handleResponse = (api, res) => {
|
|
|
79
78
|
});
|
|
80
79
|
const nextPollingInterval = (0, utils_2.getPollingInterval)(res);
|
|
81
80
|
network_1.useNetworkStore.setState({
|
|
82
|
-
noOpTimeout: setTimeout(() =>
|
|
81
|
+
noOpTimeout: setTimeout(() => fetchNoOp(), nextPollingInterval),
|
|
83
82
|
pollingInterval: nextPollingInterval,
|
|
84
83
|
seq,
|
|
85
84
|
..._context
|
package/lib/network/fetch.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../src/network/fetch.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAEH,mCAA0C;AAE1C,+CAA0C;AAC1C,6CAAyC;AACzC,mCAAoC;AACpC,4CAAiE;AACjE,sDAAgD;AAChD,8CAAmD;AACnD,8CAAmD;AACnD,kDAAwE;
|
|
1
|
+
{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../src/network/fetch.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
|
+
import type { NoOpResponse } from '../../network/fetch';
|
|
1
2
|
import type { AccountSettings } from '../../types/account';
|
|
2
|
-
import type {
|
|
3
|
+
import type { RawSoapResponse, SoapContext } from '../../types/network';
|
|
3
4
|
export declare const parsePollingInterval: (settings: AccountSettings) => number;
|
|
4
5
|
/**
|
|
5
6
|
* Return the polling interval for the next NoOp request.
|
|
@@ -22,19 +22,29 @@ const POLLING_NOWAIT_INTERVAL = 10000;
|
|
|
22
22
|
* with a 500 error
|
|
23
23
|
*/
|
|
24
24
|
const POLLING_RETRY_INTERVAL = 60000;
|
|
25
|
+
const POLLING_INVALID_DURATION = 30000;
|
|
25
26
|
const parsePollingInterval = (settings) => {
|
|
26
27
|
const pollingPref = settings.prefs?.zimbraPrefMailPollingInterval ?? '';
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
}
|
|
30
|
-
const pollingValue = parseInt(pollingPref, 10);
|
|
28
|
+
const [value, durationUnit] = pollingPref.split(/([a-z]+)/g);
|
|
29
|
+
const pollingValue = parseInt(value, 10);
|
|
31
30
|
if (Number.isNaN(pollingValue)) {
|
|
32
|
-
return
|
|
31
|
+
return POLLING_INVALID_DURATION;
|
|
33
32
|
}
|
|
34
|
-
|
|
35
|
-
|
|
33
|
+
switch (durationUnit) {
|
|
34
|
+
case undefined:
|
|
35
|
+
case 'ms':
|
|
36
|
+
return pollingValue;
|
|
37
|
+
case 's':
|
|
38
|
+
return pollingValue * 1000;
|
|
39
|
+
case 'm':
|
|
40
|
+
return pollingValue * 60 * 1000;
|
|
41
|
+
case 'h':
|
|
42
|
+
return pollingValue * 60 * 60 * 1000;
|
|
43
|
+
case 'd':
|
|
44
|
+
return pollingValue * 24 * 60 * 60 * 1000;
|
|
45
|
+
default:
|
|
46
|
+
return POLLING_INVALID_DURATION;
|
|
36
47
|
}
|
|
37
|
-
return pollingValue * 1000;
|
|
38
48
|
};
|
|
39
49
|
exports.parsePollingInterval = parsePollingInterval;
|
|
40
50
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/store/network/utils.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAEH,mCAAiC;AAEjC,mCAA0C;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/store/network/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -170,6 +170,3 @@ export type ModifyPropertiesRequest = SoapBody<{
|
|
|
170
170
|
export type BatchRequest<T extends Exactify<Record<`${string}Request`, unknown>, T> = Record<`${string}Request`, unknown>> = SoapBody<T>;
|
|
171
171
|
export type BatchResponse<T extends Exactify<Record<`${string}Response`, unknown>, T> = Record<`${string}Response`, unknown>> = SoapBody<T>;
|
|
172
172
|
export type NameSpace = ValueOf<typeof JSNS>;
|
|
173
|
-
export type NoOpResponse = SoapBody<{
|
|
174
|
-
waitDisallowed?: boolean;
|
|
175
|
-
}>;
|
|
@@ -45,6 +45,10 @@ export type ErrorSoapResponse = {
|
|
|
45
45
|
};
|
|
46
46
|
export type RawSoapResponse<R extends Record<string, unknown>> = RawSuccessSoapResponse<R> | RawErrorSoapResponse;
|
|
47
47
|
export type SoapResponse<R> = SuccessSoapResponse<R> | ErrorSoapResponse;
|
|
48
|
+
export type SoapRequest<R extends Record<string, unknown>> = {
|
|
49
|
+
Body: Record<string, SoapBody<R>>;
|
|
50
|
+
Header: SoapHeader;
|
|
51
|
+
};
|
|
48
52
|
export interface RawSoapContext {
|
|
49
53
|
refresh?: SoapRefresh;
|
|
50
54
|
notify?: Array<RawSoapNotify>;
|