Cache changes for #1003

dev/Common/Cache.js

@@ -1,9 +1,5 @@
-import { MessageSetAction } from 'Common/EnumsUser';
+let FOLDERS_CACHE = new Map,
-import { isArray } from 'Common/Utils';
+	FOLDERS_HASH_MAP = new Map,
-
-let FOLDERS_CACHE = {},
-	FOLDERS_NAME_CACHE = {},
-	MESSAGE_FLAGS_CACHE = {},
 	inboxFolderName = 'INBOX';
 
 export const
@@ -11,18 +7,10 @@ export const
 	 * @returns {void}
 	 */
 	clearCache = () => {
-		FOLDERS_CACHE = {};
+		FOLDERS_CACHE.clear();
-		FOLDERS_NAME_CACHE = {};
+		FOLDERS_HASH_MAP.clear();
-		MESSAGE_FLAGS_CACHE = {};
 	},
 
-	/**
-	 * @param {string} folderFullName
-	 * @param {string} uid
-	 * @returns {string}
-	 */
-	getMessageKey = (folderFullName, uid) => folderFullName + '#' + uid,
-
 	/**
 	 * @returns {string}
 	 */
@@ -37,15 +25,15 @@ export const
 	 * @param {string} fullNameHash
 	 * @returns {string}
 	 */
-	getFolderFullName = fullNameHash => (fullNameHash && FOLDERS_NAME_CACHE[fullNameHash]) || '',
+	getFolderFromHashMap = fullNameHash => getFolderFromCacheList(FOLDERS_HASH_MAP.get(fullNameHash)),
 
 	/**
 	 * @param {?FolderModel} folder
 	 */
 	setFolder = folder => {
 		folder.etag = '';
-		FOLDERS_CACHE[folder.fullName] = folder;
+		FOLDERS_CACHE.set(folder.fullName, folder);
-		FOLDERS_NAME_CACHE[folder.fullNameHash] = folder.fullName;
+		FOLDERS_HASH_MAP.set(folder.fullNameHash, folder.fullName);
 	},
 
 	/**
@@ -53,122 +41,16 @@ export const
 	 * @param {string} folderETag
 	 */
 	setFolderETag = (folderFullName, folderETag) =>
-		FOLDERS_CACHE[folderFullName] && (FOLDERS_CACHE[folderFullName].etag = folderETag),
+		FOLDERS_CACHE.has(folderFullName) && (FOLDERS_CACHE.get(folderFullName).etag = folderETag),
 
 	/**
 	 * @param {string} folderFullName
 	 * @returns {?FolderModel}
 	 */
 	getFolderFromCacheList = folderFullName =>
-		FOLDERS_CACHE[folderFullName] || null,
+		FOLDERS_CACHE.get(folderFullName),
 
 	/**
 	 * @param {string} folderFullName
 	 */
-	removeFolderFromCacheList = folderFullName => delete FOLDERS_CACHE[folderFullName];
+	removeFolderFromCacheList = folderFullName => FOLDERS_CACHE.delete(folderFullName);
-
-export class MessageFlagsCache
-{
-	/**
-	 * @param {string} folderFullName
-	 * @param {string} uid
-	 * @param {string} flag
-	 * @returns {bool}
-	 */
-	static hasFlag(folderFullName, uid, flag) {
-		return MESSAGE_FLAGS_CACHE[folderFullName]?.[uid]?.includes(flag);
-	}
-
-	/**
-	 * @param {string} folderFullName
-	 * @param {string} uid
-	 * @returns {?Array}
-	 */
-	static getFor(folderFullName, uid) {
-		return MESSAGE_FLAGS_CACHE[folderFullName]?.[uid];
-	}
-
-	/**
-	 * @param {string} folderFullName
-	 * @param {string} uid
-	 * @param {Array} flagsCache
-	 */
-	static setFor(folderFullName, uid, flags) {
-		if (isArray(flags)) {
-			if (!MESSAGE_FLAGS_CACHE[folderFullName]) {
-				MESSAGE_FLAGS_CACHE[folderFullName] = {};
-			}
-			MESSAGE_FLAGS_CACHE[folderFullName][uid] = flags;
-		}
-	}
-
-	/**
-	 * @param {string} folderFullName
-	 */
-	static clearFolder(folderFullName) {
-		MESSAGE_FLAGS_CACHE[folderFullName] = {};
-	}
-
-	/**
-	 * @param {(MessageModel|null)} message
-	 */
-	static initMessage(message) {
-		if (message) {
-			const uid = message.uid,
-				flags = this.getFor(message.folder, uid),
-				thread = message.threads();
-
-			isArray(flags) && message.flags(flags);
-
-			if (thread.length) {
-				message.hasUnseenSubMessage(!!thread.find(iSubUid =>
-					(uid !== iSubUid) && !this.hasFlag(message.folder, iSubUid, '\\seen')
-				));
-				message.hasFlaggedSubMessage(!!thread.find(iSubUid =>
-					(uid !== iSubUid) && this.hasFlag(message.folder, iSubUid, '\\flagged')
-				));
-			}
-		}
-	}
-
-	/**
-	 * @param {(MessageModel|null)} message
-	 */
-	static store(message) {
-		message && this.setFor(message.folder, message.uid, message.flags());
-	}
-
-	/**
-	 * @param {string} folder
-	 * @param {string} uid
-	 * @param {number} setAction
-	 */
-	static storeBySetAction(folder, uid, setAction) {
-		let flags = this.getFor(folder, uid) || [];
-		const
-			unread = flags.includes('\\seen') ? 0 : 1,
-			add = item => flags.includes(item) || flags.push(item),
-			remove = item => flags = flags.filter(flag => flag != item);
-
-		switch (setAction) {
-			case MessageSetAction.SetSeen:
-				add('\\seen');
-				break;
-			case MessageSetAction.UnsetSeen:
-				remove('\\seen');
-				break;
-			case MessageSetAction.SetFlag:
-				add('\\flagged');
-				break;
-			case MessageSetAction.UnsetFlag:
-				remove('\\flagged');
-				break;
-			// no default
-		}
-
-		this.setFor(folder, uid, flags);
-
-		return unread;
-	}
-
-}

dev/Common/Folders.js

@@ -1,6 +1,5 @@
 import { isArray, arrayLength } from 'Common/Utils';
 import {
-	MessageFlagsCache,
 	setFolderETag,
 	getFolderInboxName,
 	getFolderFromCacheList
@@ -112,8 +111,8 @@ folderInformation = (folder, list) => {
 
 		if (arrayLength(list)) {
 			list.forEach(messageListItem => {
-				MessageFlagsCache.getFor(folder, messageListItem.uid) || uids.push(messageListItem.uid);
+				uids.push(messageListItem.uid);
-				messageListItem.threads.forEach(uid => MessageFlagsCache.getFor(folder, uid) || uids.push(uid));
+				messageListItem.threads.forEach(uid => uids.push(uid));
 			});
 			count = uids.length;
 		}
@@ -134,16 +133,6 @@ folderInformation = (folder, list) => {
 						folderFromCache.totalEmails(result.totalEmails);
 						folderFromCache.unreadEmails(result.unreadEmails);
 
-						unreadCountChange && MessageFlagsCache.clearFolder(folderFromCache.fullName);
-
-						if (result.messagesFlags.length) {
-							result.messagesFlags.forEach(message =>
-								MessageFlagsCache.setFor(folderFromCache.fullName, message.uid.toString(), message.flags)
-							);
-
-							MessagelistUserStore.reloadFlagsAndCachedMessage();
-						}
-
 						MessagelistUserStore.notifyNewMessages(folderFromCache.fullName, result.newMessages);
 
 						if (!oldHash || unreadCountChange || result.etag !== oldHash) {
@@ -163,8 +152,6 @@ folderInformation = (folder, list) => {
 				flagsUids: uids,
 				uidNext: getFolderFromCacheList(folder)?.uidNext || 0 // Used to check for new messages
 			});
-		} else if (SettingsUserStore.useThreads()) {
-			MessagelistUserStore.reloadFlagsAndCachedMessage();
 		}
 	}
 },
@@ -191,8 +178,6 @@ folderInformationMultiply = (boot = false) => {
 						folder.totalEmails(item.totalEmails);
 						folder.unreadEmails(item.unreadEmails);
 
-						unreadCountChange && MessageFlagsCache.clearFolder(folder.fullName);
-
 						if (!oldHash || item.etag !== oldHash) {
 							if (folder.fullName === FolderUserStore.currentFolderFullName()) {
 								MessagelistUserStore.reload();

dev/Common/UtilsUser.js

@@ -1,4 +1,3 @@
-import { MessageFlagsCache } from 'Common/Cache';
 import { Notifications } from 'Common/Enums';
 import { MessageSetAction, ComposeType/*, FolderType*/ } from 'Common/EnumsUser';
 import { doc, createElement, elementById, dropdowns, dropdownVisibility, SettingsGet, leftPanelDisabled } from 'Common/Globals';
@@ -313,8 +312,6 @@ populateMessageBody = (oMessage, popup) => {
 						oMessage.body.remove();
 */
 						viewMessage(oMessage, popup);
-
-						MessageFlagsCache.initMessage(oMessage);
 					}
 				}
 				popup || MessageUserStore.loading(false);

dev/Model/FolderCollection.js

@@ -3,7 +3,7 @@ import { AbstractCollectionModel } from 'Model/AbstractCollection';
 import { UNUSED_OPTION_VALUE } from 'Common/Consts';
 import { isArray, getKeyByValue, forEachObjectEntry, b64EncodeJSONSafe } from 'Common/Utils';
 import { ClientSideKeyNameExpandedFolders, FolderType, FolderMetadataKeys } from 'Common/EnumsUser';
-import { getFolderFromCacheList, setFolder, setFolderInboxName, removeFolderFromCacheList } from 'Common/Cache';
+import { clearCache, getFolderFromCacheList, setFolder, setFolderInboxName, removeFolderFromCacheList } from 'Common/Cache';
 import { Settings, SettingsGet, fireEvent } from 'Common/Globals';
 import { Notifications } from 'Common/Enums';
 
@@ -92,6 +92,7 @@ export const
 		Remote.abort('Folders')
 			.post('Folders', FolderUserStore.foldersLoading)
 			.then(data => {
+				clearCache();
 				FolderCollectionModel.reviveFromJson(data.Result)?.storeIt();
 				fCallback?.(true);
 				// Repeat every 15 minutes?

dev/Model/Message.js

@@ -21,7 +21,6 @@ import PreviewHTML from 'Html/PreviewMessage.html';
 
 import { LanguageStore } from 'Stores/Language';
 
-//import { MessageFlagsCache } from 'Common/Cache';
 import Remote from 'Remote/User/Fetch';
 
 const
@@ -34,7 +33,6 @@ const
 		Remote.request('MessageSetKeyword', iError => {
 			if (!iError) {
 				isSet ? flags.remove(lower) : flags.push(lower);
-//				MessageFlagsCache.setFor(message.folder, message.uid, flags());
 			}
 		}, {
 			folder: message.folder,

dev/Model/MessageCollection.js

@@ -2,10 +2,6 @@ import { AbstractCollectionModel } from 'Model/AbstractCollection';
 import { MessageModel } from 'Model/Message';
 import { MessageUserStore } from 'Stores/User/Message';
 
-import {
-	MessageFlagsCache
-} from 'Common/Cache';
-
 'use strict';
 
 export class MessageCollectionModel extends AbstractCollectionModel
@@ -30,7 +26,7 @@ export class MessageCollectionModel extends AbstractCollectionModel
 	 * @param {?Object} json
 	 * @returns {MessageCollectionModel}
 	 */
-	static reviveFromJson(object, cached) {
+	static reviveFromJson(object/*, cached*/) {
 		let msg = MessageUserStore.message();
 		return super.reviveFromJson(object, message => {
 			// If message is currently viewed, use that.
@@ -38,7 +34,6 @@ export class MessageCollectionModel extends AbstractCollectionModel
 			message = (msg && msg.hash === message.hash) ? msg : MessageModel.reviveFromJson(message);
 			if (message) {
 				message.deleted(false);
-				cached ? MessageFlagsCache.initMessage(message) : MessageFlagsCache.store(message);
 				return message;
 			}
 		});

dev/Screen/User/MailBox.js

@@ -2,7 +2,7 @@ import { Scope } from 'Common/Enums';
 import { doc, createElement, Settings } from 'Common/Globals';
 import { pString, pInt } from 'Common/Utils';
 import { moveAction } from 'Common/UtilsUser';
-import { getFolderFromCacheList, getFolderFullName, getFolderInboxName } from 'Common/Cache';
+import { getFolderFromHashMap, getFolderInboxName } from 'Common/Cache';
 import { i18n, initOnStartOrLangChange } from 'Common/Translator';
 
 import { AppUserStore } from 'Stores/User/App';
@@ -67,7 +67,7 @@ export class MailBoxUserScreen extends AbstractScreen {
 	 * @returns {void}
 	 */
 	onRoute(folderHash, page, search, messageUid) {
-		const folder = getFolderFromCacheList(getFolderFullName(folderHash.replace(/~([\d]+)$/, '')));
+		const folder = getFolderFromHashMap(folderHash.replace(/~([\d]+)$/, ''));
 		if (folder) {
 			FolderUserStore.currentFolder(folder);
 			MessagelistUserStore.page(1 > page ? 1 : page);

dev/Stores/User/Messagelist.js

@@ -4,14 +4,13 @@ import { SMAudio } from 'Common/Audio';
 import { Notifications } from 'Common/Enums';
 import { MessageSetAction } from 'Common/EnumsUser';
 import { $htmlCL } from 'Common/Globals';
-import { arrayLength, pInt, pString } from 'Common/Utils';
+import { arrayLength, pString } from 'Common/Utils';
 import { UNUSED_OPTION_VALUE } from 'Common/Consts';
 
 import {
 	getFolderInboxName,
 	getFolderFromCacheList,
-	setFolderETag,
+	setFolderETag
-	MessageFlagsCache
 } from 'Common/Cache';
 
 import { mailBox } from 'Common/Links';
@@ -221,9 +220,6 @@ MessagelistUserStore.reload = (bDropPagePosition = false, bDropCurrentFolderCach
 						}
 
 						if (null != folderInfo.unreadEmails) {
-							if (pInt(folder.unreadEmails()) !== pInt(folderInfo.unreadEmails)) {
-								MessageFlagsCache.clearFolder(folder.fullName);
-							}
 							folder.unreadEmails(folderInfo.unreadEmails);
 						}
 
@@ -307,22 +303,38 @@ MessagelistUserStore.setAction = (sFolderFullName, iSetAction, messages) => {
 	messages = messages || MessagelistUserStore.listChecked();
 
 	let folder,
-		alreadyUnread = 0,
+		rootUids = [],
-		rootUids = messages.map(oMessage => oMessage?.uid).validUnique(),
+		length;
+
+	if (iSetAction == MessageSetAction.SetSeen) {
+		messages.forEach(oMessage =>
+			oMessage.isUnseen() && rootUids.push(oMessage.uid) && oMessage.flags.push('\\seen')
+		);
+	} else if (iSetAction == MessageSetAction.UnsetSeen) {
+		messages.forEach(oMessage =>
+			!oMessage.isUnseen() && rootUids.push(oMessage.uid) && oMessage.flags.remove('\\seen')
+		);
+	} else if (iSetAction == MessageSetAction.SetFlag) {
+		messages.forEach(oMessage =>
+			!oMessage.isFlagged() && rootUids.push(oMessage.uid) && oMessage.flags.push('\\flagged')
+		);
+	} else if (iSetAction == MessageSetAction.UnsetFlag) {
+		messages.forEach(oMessage =>
+			oMessage.isFlagged() && rootUids.push(oMessage.uid) && oMessage.flags.remove('\\flagged')
+		);
+	}
+	rootUids = rootUids.validUnique();
 	length = rootUids.length;
 
 	if (sFolderFullName && length) {
-		rootUids.forEach(sSubUid =>
-			alreadyUnread += MessageFlagsCache.storeBySetAction(sFolderFullName, sSubUid, iSetAction)
-		);
 		switch (iSetAction) {
 			case MessageSetAction.SetSeen:
-				length = 0;
+				length = -length;
 				// fallthrough is intentionally
 			case MessageSetAction.UnsetSeen:
 				folder = getFolderFromCacheList(sFolderFullName);
 				if (folder) {
-					folder.unreadEmails(Math.max(0, folder.unreadEmails() - alreadyUnread + length));
+					folder.unreadEmails(Math.max(0, folder.unreadEmails() + length));
 				}
 				Remote.request('MessageSetSeen', null, {
 					folder: sFolderFullName,
@@ -341,8 +353,6 @@ MessagelistUserStore.setAction = (sFolderFullName, iSetAction, messages) => {
 				break;
 			// no default
 		}
-
-		MessagelistUserStore.reloadFlagsAndCachedMessage();
 	}
 };
 
@@ -454,9 +464,4 @@ MessagelistUserStore.removeMessagesFromList = (
 			)
 		);
 	}
-},
-
-MessagelistUserStore.reloadFlagsAndCachedMessage = () => {
-	MessagelistUserStore.forEach(message => MessageFlagsCache.initMessage(message));
-	MessageFlagsCache.initMessage(MessageUserStore.message());
 };

dev/View/Popup/Compose.js

@@ -19,7 +19,7 @@ import { UNUSED_OPTION_VALUE } from 'Common/Consts';
 import { folderInformation, messagesDeleteHelper } from 'Common/Folders';
 import { serverRequest } from 'Common/Links';
 import { i18n, getNotification, getUploadErrorDescByCode, timestampToString } from 'Common/Translator';
-import { MessageFlagsCache, setFolderETag } from 'Common/Cache';
+import { setFolderETag } from 'Common/Cache';
 import { SettingsCapa, SettingsGet, elementById, addShortcut, createElement } from 'Common/Globals';
 //import { exitFullscreen, isFullscreen, toggleFullscreen } from 'Common/Fullscreen';
 
@@ -440,17 +440,16 @@ export class ComposePopupView extends AbstractViewPopup {
 			} else try {
 				this.sendError(false);
 				this.sending(true);
-
+/*
 				if (3 === arrayLength(this.aDraftInfo)) {
 					const flagsCache = MessageFlagsCache.getFor(this.aDraftInfo[2], this.aDraftInfo[1]);
 					if (isArray(flagsCache)) {
 						flagsCache.push(('forward' === this.aDraftInfo[0]) ? '$forwarded' : '\\answered');
 						MessageFlagsCache.setFor(this.aDraftInfo[2], this.aDraftInfo[1], flagsCache);
-						MessagelistUserStore.reloadFlagsAndCachedMessage();
 						setFolderETag(this.aDraftInfo[2], '');
 					}
 				}
-
+*/
 				sSentFolder = UNUSED_OPTION_VALUE === sSentFolder ? '' : sSentFolder;
 
 				this.getMessageRequestParams(sSentFolder).then(params => {

dev/View/User/MailBox/MessageList.js

@@ -24,10 +24,7 @@ import { i18n } from 'Common/Translator';
 
 import { dropFilesInFolder } from 'Common/Folders';
 
-import {
+import { getFolderFromCacheList } from 'Common/Cache';
-	getFolderFromCacheList,
-	MessageFlagsCache
-} from 'Common/Cache';
 
 import { AppUserStore } from 'Stores/User/App';
 import { SettingsUserStore } from 'Stores/User/Settings';
@@ -476,15 +473,11 @@ export class MailMessageList extends AbstractViewRight {
 					folder.unreadEmails(0);
 				}
 
-				MessageFlagsCache.clearFolder(sFolderFullName);
-
 				Remote.request('MessageSetSeenToAll', null, {
 					folder: sFolderFullName,
 					setAction: 1,
 					threadUids: uids.join(',')
 				});
-
-				MessagelistUserStore.reloadFlagsAndCachedMessage();
 			}
 		}
 	}

dev/View/User/MailBox/MessageView.js

@@ -30,8 +30,6 @@ import { SMAudio } from 'Common/Audio';
 
 import { i18n } from 'Common/Translator';
 
-import { MessageFlagsCache } from 'Common/Cache';
-
 import { AppUserStore } from 'Stores/User/App';
 import { SettingsUserStore } from 'Stores/User/Settings';
 import { AccountUserStore } from 'Stores/User/Account';
@@ -516,8 +514,6 @@ export class MailMessageView extends AbstractViewRight {
 				if (!iError) {
 					oMessage.flags.push('$mdnsent');
 //					oMessage.flags.valueHasMutated();
-					MessageFlagsCache.store(oMessage);
-					MessagelistUserStore.reloadFlagsAndCachedMessage();
 				}
 			}, {
 				messageFolder: oMessage.folder,

dev/View/User/SystemDropDown.js

@@ -16,7 +16,6 @@ import { fireEvent, stopEvent, SettingsCapa, registerShortcut } from 'Common/Glo
 
 import Remote from 'Remote/User/Fetch';
 import { getNotification } from 'Common/Translator';
-//import { clearCache } from 'Common/Cache';
 //import { koComputable } from 'External/ko';
 import { addObservablesTo } from 'External/ko';
 
@@ -66,7 +65,6 @@ export class SystemDropDownUserView extends AbstractViewRight {
 					} else {
 /*						// Not working yet
 						forEachObjectEntry(oData.Result, (key, value) => rl.settings.set(key, value));
-						clearCache();
 //						MessageUserStore.message();
 //						MessageUserStore.purgeCache();
 						MessagelistUserStore([]);