Stowage/tutanota
2
0
Fork 0
mirror of https://github.com/tutao/tutanota.git synced 2025-12-08 06:09:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix offline login

Browse source 
Offline login was broken because RootInstance for TutanotaProperties is
not cached anymore. This happened in 6acc5ff because of confusion about
semantics of isCachedType() which was meant to be used for range
requests only. For non-range requests we should cache all types, except
the explicitly ignored ones.

We fixed the issue by only checking for custom id in range requests.

Close #8396

Co-authored-by: bir <bir@tutao.de>
This commit is contained in:
ivk 2025-01-28 10:54:28 +01:00
parent 357fc58def
commit fbc42098a9
No known key found for this signature in database
GPG key ID: 1401CAEDBC268D18
2 changed files with 98 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/common/api/worker/rest/DefaultEntityRestCache.ts
View file

@ -41,7 +41,7 @@ import {
import { CUSTOM_MAX_ID, CUSTOM_MIN_ID, firstBiggerThanSecond, GENERATED_MAX_ID, GENERATED_MIN_ID, getElementId, isSameId } from "../../common/utils/EntityUtils"
import { ProgrammingError } from "../../common/error/ProgrammingError"
import { assertWorkerOrNode } from "../../common/Env"
import type { ElementEntity, ListElementEntity, SomeEntity, TypeModel } from "../../common/EntityTypes"
import type { ListElementEntity, SomeEntity, TypeModel } from "../../common/EntityTypes"
import { QueuedBatch } from "../EventQueue.js"
import { ENTITY_EVENT_BATCH_EXPIRE_MS } from "../EventBusClient"
import { CustomCacheHandlerMap } from "./CustomCacheHandler.js"
@ -83,7 +83,7 @@ const IGNORED_TYPES = [
* OfflineStorage.ensureBase64Ext). In theory, we can try to enable caching for all types but as of now we enable it for a limited amount of types because there
* are other ways to cache customId types (see implementation of CustomCacheHandler)
*/
const CACHABLE_CUSTOMID_TYPES = [MailSetEntryTypeRef, GroupKeyTypeRef] as const
const CACHEABLE_CUSTOMID_TYPES = [MailSetEntryTypeRef, GroupKeyTypeRef] as const
export interface EntityRestCache extends EntityRestInterface {
/**
@ -413,7 +413,9 @@ export class DefaultEntityRestCache implements EntityRestCache {
return await customHandler.loadRange(this.storage, listId, start, count, reverse)
}
const useCache = await this.shouldUseCache(typeRef, opts)
const typeModel = await resolveTypeReference(typeRef)
const useCache = (await this.shouldUseCache(typeRef, opts)) && isCachedRangeType(typeModel, typeRef)
if (!useCache) {
return await this.entityRestClient.loadRange(typeRef, listId, start, count, reverse, opts)
}
@ -427,7 +429,6 @@ export class DefaultEntityRestCache implements EntityRestCache {
await this.storage.lockRangesDbAccess(listId)
try {
const typeModel = await resolveTypeReference(typeRef)
const range = await this.storage.getRangeForList(typeRef, listId)
if (behavior.writesToCache) {
@ -974,20 +975,14 @@ export class DefaultEntityRestCache implements EntityRestCache {
* @param opts entity rest client options, if any
* @return true if the cache can be used, false if a direct network request should be performed
*/
private async shouldUseCache(typeRef: TypeRef<any>, opts?: EntityRestClientLoadOptions): Promise<boolean> {
private shouldUseCache(typeRef: TypeRef<any>, opts?: EntityRestClientLoadOptions): boolean {
// some types won't be cached
if (isIgnoredType(typeRef)) {
return false
}
// if a specific version is requested we have to load again and do not want to store it in the cache
if (opts?.queryParams?.version != null) {
return false
}
// otherwise we should ignore certain custom id types
const typeModel = await resolveTypeReference(typeRef)
return isCachedType(typeModel, typeRef)
return opts?.queryParams?.version == null
}
}
@ -1050,8 +1045,8 @@ function isRangeRequestAwayFromExistingRange(range: Range, reverse: boolean, sta
/**
* some types are completely ignored by the cache and always served from a request.
* Note:
* isCachedType(ref) ---> !isIgnoredType(ref) but
* isIgnoredType(ref) -/-> !isCachedType(ref) because of opted-in CustomId types.
* isCachedRangeType(ref) ---> !isIgnoredType(ref) but
* isIgnoredType(ref) -/-> !isCachedRangeType(ref) because of opted-in CustomId types.
*/
function isIgnoredType(typeRef: TypeRef<unknown>): boolean {
return typeRef.app === "monitor" || IGNORED_TYPES.some((ref) => isSameTypeRef(typeRef, ref))
@ -1061,16 +1056,16 @@ function isIgnoredType(typeRef: TypeRef<unknown>): boolean {
* Checks if for the given type, that contains a customId, caching is enabled.
*/
function isCachableCustomIdType(typeRef: TypeRef<unknown>): boolean {
return CACHABLE_CUSTOMID_TYPES.some((ref) => isSameTypeRef(typeRef, ref))
return CACHEABLE_CUSTOMID_TYPES.some((ref) => isSameTypeRef(typeRef, ref))
}
/**
* customId types are normally not cached, but some are opted in.
* Ranges for customId types are normally not cached, but some are opted in.
* Note:
* isCachedType(ref) ---> !isIgnoredType(ref) but
* isIgnoredType(ref) -/-> !isCachedType(ref)
* isCachedRangeType(ref) ---> !isIgnoredType(ref) but
* isIgnoredType(ref) -/-> !isCachedRangeType(ref)
*/
function isCachedType(typeModel: TypeModel, typeRef: TypeRef<unknown>): boolean {
function isCachedRangeType(typeModel: TypeModel, typeRef: TypeRef<unknown>): boolean {
return (!isIgnoredType(typeRef) && isGeneratedIdType(typeModel)) || isCachableCustomIdType(typeRef)
}