Tools/Notes
1
0
Fork 0
mirror of https://github.com/TriliumNext/Notes.git synced 2025-07-27 18:12:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(monorepo/client): error related to blobs

Browse Source
This commit is contained in:
Elian Doran 2025-04-18 10:36:51 +03:00
parent 011c859cea
commit 1b24207e9e
No known key found for this signature in database
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/client/src/services/froca-interface.ts
View File

@ -11,7 +11,7 @@ export interface Froca {
attachments: Record<string, FAttachment>; attachments: Record<string, FAttachment>;
blobPromises: Record<string, Promise<void | FBlob> | null>; blobPromises: Record<string, Promise<void | FBlob> | null>;
getBlob(entityType: string, entityId: string): Promise<void | FBlob | null>; getBlob(entityType: string, entityId: string): Promise<FBlob | null>;
getNote(noteId: string, silentNotFoundError?: boolean): Promise<FNote | null>; getNote(noteId: string, silentNotFoundError?: boolean): Promise<FNote | null>;
getNoteFromCache(noteId: string): FNote; getNoteFromCache(noteId: string): FNote;
getNotesFromCache(noteIds: string[], silentNotFoundError?: boolean): FNote[]; getNotesFromCache(noteIds: string[], silentNotFoundError?: boolean): FNote[];

9
apps/client/src/services/froca.ts
View File

@ -36,7 +36,7 @@ class FrocaImpl implements Froca {
branches!: Record<string, FBranch>; branches!: Record<string, FBranch>;
attributes!: Record<string, FAttribute>; attributes!: Record<string, FAttribute>;
attachments!: Record<string, FAttachment>; attachments!: Record<string, FAttachment>;
blobPromises!: Record<string, Promise<void | FBlob> | null>; blobPromises!: Record<string, Promise<FBlob> | null>;
constructor() { constructor() {
this.initializedPromise = this.loadInitialTree(); this.initializedPromise = this.loadInitialTree();
@ -368,7 +368,7 @@ class FrocaImpl implements Froca {
}); });
} }
async getBlob(entityType: string, entityId: string) { async getBlob(entityType: string, entityId: string): Promise<FBlob | null> {
// I'm not sure why we're not using blobIds directly, it would save us this composite key ... // I'm not sure why we're not using blobIds directly, it would save us this composite key ...
// perhaps one benefit is that we're always requesting the latest blob, not relying on perhaps faulty/slow // perhaps one benefit is that we're always requesting the latest blob, not relying on perhaps faulty/slow
// websocket update? // websocket update?
@ -378,7 +378,10 @@ class FrocaImpl implements Froca {
this.blobPromises[key] = server this.blobPromises[key] = server
.get<FBlobRow>(`${entityType}/${entityId}/blob`) .get<FBlobRow>(`${entityType}/${entityId}/blob`)
.then((row) => new FBlob(row)) .then((row) => new FBlob(row))
.catch((e) => console.error(`Cannot get blob for ${entityType} '${entityId}'`, e)); .catch((e) => {
console.error(`Cannot get blob for ${entityType} '${entityId}'`, e);
return null;
});
// we don't want to keep large payloads forever in memory, so we clean that up quite quickly // we don't want to keep large payloads forever in memory, so we clean that up quite quickly
// this cache is more meant to share the data between different components within one business transaction (e.g. loading of the note into the tab context and all the components) // this cache is more meant to share the data between different components within one business transaction (e.g. loading of the note into the tab context and all the components)