Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-08-30 12:39:20 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Converted *Ajax into *Fetch (because we use the Fetch API, not jQuery.ajax)

Browse source
This commit is contained in:
djmaze 2020-09-14 19:40:56 +02:00
parent bb4d66d6d2
commit 29cf711a6a
52 changed files with 399 additions and 540 deletions
Download patch file Download diff file Expand all files Collapse all files

145
dev/Promises/AbstractAjax.js
View file

@ -1,145 +0,0 @@
import { ajax } from 'Common/Links';
import { pInt, pString } from 'Common/Utils';
import { DEFAULT_AJAX_TIMEOUT, TOKEN_ERROR_LIMIT, AJAX_ERROR_LIMIT } from 'Common/Consts';
import { Notification } from 'Common/Enums';
import { data as GlobalsData } from 'Common/Globals';
import { AbstractBasicPromises } from 'Promises/AbstractBasic';
class AbstractAjaxPromises extends AbstractBasicPromises {
oRequests = {};
constructor() {
super();
this.clear();
}
clear() {
this.oRequests = {};
}
abort(sAction, bClearOnly) {
if (this.oRequests[sAction]) {
if (!bClearOnly && this.oRequests[sAction].abort) {
// this.oRequests[sAction].__aborted__ = true;
this.oRequests[sAction].abort();
}
this.oRequests[sAction] = null;
delete this.oRequests[sAction];
}
return this;
}
ajaxRequest(action, isPost, timeOut, params, additionalGetString, fTrigger) {
additionalGetString = pString(additionalGetString);
let init = {};
this.setTrigger(fTrigger, true);
if (window.AbortController) {
this.abort(action);
const controller = new AbortController();
setTimeout(() => controller.abort(), pInt(timeOut, DEFAULT_AJAX_TIMEOUT));
init.signal = controller.signal;
this.oRequests[action] = controller;
}
return rl.fetchJSON(ajax(additionalGetString), init, pInt(timeOut, DEFAULT_AJAX_TIMEOUT), isPost ? params : null)
.then(data => {
this.abort(action, true);
if (!data) {
return Promise.reject(Notification.AjaxParse);
}
if (data.UpdateToken) {
rl.hash.set();
rl.settings.set('AuthAccountHash', data.UpdateToken);
}
/*
let isCached = false, type = '';
if (data && data.Time) {
isCached = pInt(data.Time) > microtime() - start;
}
// backward capability
switch (true) {
case 'success' === textStatus && data && data.Result && action === data.Action:
type = StorageResultType.Success;
break;
case 'abort' === textStatus && (!data || !data.__aborted__):
type = StorageResultType.Abort;
break;
default:
type = StorageResultType.Error;
break;
}
*/
this.setTrigger(fTrigger, false);
if (!data.Result || action !== data.Action) {
if ([
Notification.AuthError,
Notification.AccessError,
Notification.ConnectionError,
Notification.DomainNotAllowed,
Notification.AccountNotAllowed,
Notification.MailServerError,
Notification.UnknownNotification,
Notification.UnknownError
].includes(data.ErrorCode)
) {
++GlobalsData.iAjaxErrorCount;
}
if (Notification.InvalidToken === data.ErrorCode) {
++GlobalsData.iTokenErrorCount;
}
if (TOKEN_ERROR_LIMIT < GlobalsData.iTokenErrorCount) {
rl.logoutReload();
}
if (data.ClearAuth || data.Logout || AJAX_ERROR_LIMIT < GlobalsData.iAjaxErrorCount) {
if (GlobalsData.__APP__) {
rl.hash.clear();
if (!data.ClearAuth) {
rl.logoutReload();
}
}
}
return Promise.reject(data.ErrorCode ? data.ErrorCode : Notification.AjaxFalse);
}
return data;
}).catch(err => {
if (err.name == 'AbortError') { // handle abort()
return Promise.reject(Notification.AjaxAbort);
}
return Promise.reject(err);
});
}
getRequest(sAction, fTrigger, sAdditionalGetString, iTimeOut) {
sAdditionalGetString = undefined === sAdditionalGetString ? '' : pString(sAdditionalGetString);
sAdditionalGetString = sAction + '/' + sAdditionalGetString;
return this.ajaxRequest(sAction, false, iTimeOut, null, sAdditionalGetString, fTrigger);
}
postRequest(action, fTrigger, params, timeOut) {
params = params || {};
params.Action = action;
return this.ajaxRequest(action, true, timeOut, params, '', fTrigger);
}
}
export { AbstractAjaxPromises, AbstractAjaxPromises as default };

27
dev/Promises/AbstractBasic.js
View file

@ -1,27 +0,0 @@
export class AbstractBasicPromises {
oPromisesStack = {};
func(fFunc) {
fFunc();
return this;
}
fastResolve(mData) {
return Promise.resolve(mData);
}
fastReject(mData) {
return Promise.reject(mData);
}
setTrigger(trigger, value) {
if (trigger) {
value = !!value;
(Array.isArray(trigger) ? trigger : [trigger]).forEach((fTrigger) => {
if (fTrigger) {
fTrigger(value);
}
});
}
}
}

56
dev/Promises/User/Ajax.js
View file

@ -1,56 +0,0 @@
import PromisesPopulator from 'Promises/User/Populator';
import { AbstractAjaxPromises } from 'Promises/AbstractAjax';
class UserAjaxUserPromises extends AbstractAjaxPromises {
constructor() {
super();
this.foldersTimeout = 0;
}
foldersReload(fTrigger) {
return this.abort('Folders')
.postRequest('Folders', fTrigger)
.then((data) => {
PromisesPopulator.foldersList(data.Result);
PromisesPopulator.foldersAdditionalParameters(data.Result);
return true;
});
}
foldersReloadWithTimeout(fTrigger) {
this.setTrigger(fTrigger, true);
clearTimeout(this.foldersTimeout);
this.foldersTimeout = setTimeout(() => this.foldersReload(fTrigger), 500);
}
folderDelete(sFolderFullNameRaw, fTrigger) {
return this.postRequest('FolderDelete', fTrigger, {
'Folder': sFolderFullNameRaw
});
}
folderCreate(sNewFolderName, sParentName, fTrigger) {
return this.postRequest('FolderCreate', fTrigger, {
'Folder': sNewFolderName,
'Parent': sParentName
});
}
folderRename(sPrevFolderFullNameRaw, sNewFolderName, fTrigger) {
return this.postRequest('FolderRename', fTrigger, {
'Folder': sPrevFolderFullNameRaw,
'NewFolderName': sNewFolderName
});
}
attachmentsActions(sAction, aHashes, fTrigger) {
return this.postRequest('AttachmentsActions', fTrigger, {
'Do': sAction,
'Hashes': aHashes
});
}
}
export default new UserAjaxUserPromises();

6
dev/Promises/User/Populator.js
View file

@ -8,14 +8,14 @@ import * as Local from 'Storage/Client';
import AppStore from 'Stores/User/App';
import FolderStore from 'Stores/User/Folder';
import Remote from 'Remote/User/Ajax';
import Remote from 'Remote/User/Fetch';
import { FolderModel } from 'Model/Folder';
import { AbstractBasicPromises } from 'Promises/AbstractBasic';
const Settings = rl.settings;
class PromisesUserPopulator extends AbstractBasicPromises {
class PromisesUserPopulator {
/**
* @param {string} sFullNameHash
* @param {Array?} expandedFolders