There can be more than Notion and Miro. AFFiNE(pronounced [ə‘fain]) is a next-gen knowledge base that brings planning, sorting and creating all together. Privacy first, open-source, customizable and ready to use.
TypeScript appcrdteditorelectronknowledge-basemarkdownmironotesnotionnotion-alternativerustrust-langrust-languagetabletableviewwhiteboardwikiworkspace
feat(editor): add blobState$ to BlobEngine (#11756)
fundone9003dec9ef7
diff --git a/blocksuite/framework/sync/src/blob/engine.ts b/blocksuite/framework/sync/src/blob/engine.tsindex a95732939d..89546eebab 100644--- a/blocksuite/framework/sync/src/blob/engine.ts+++ b/blocksuite/framework/sync/src/blob/engine.ts@@ -104,6 +104,10 @@ export class BlobEngine {return key;}+ blobState$(key: string) {+ return this.main.blobState$?.(key) ?? null;+ }+start() {if (this._abort) {return;diff --git a/blocksuite/framework/sync/src/blob/source.ts b/blocksuite/framework/sync/src/blob/source.tsindex ebb675db58..7b9d8382f1 100644--- a/blocksuite/framework/sync/src/blob/source.ts+++ b/blocksuite/framework/sync/src/blob/source.ts@@ -1,3 +1,12 @@+import type { Observable } from 'rxjs';++export interface BlobState {+ uploading: boolean;+ downloading: boolean;+ errorMessage?: string | null;+ overSize: boolean;+}+export interface BlobSource {name: string;readonly: boolean;@@ -5,4 +14,6 @@ export interface BlobSource {set: (key: string, value: Blob) => Promise<string>;delete: (key: string) => Promise<void>;list: () => Promise<string[]>;+ // This state is only available when uploading to the cloud or downloading from the cloud.+ blobState$?: (key: string) => Observable<BlobState> | null;}diff --git a/packages/common/nbstore/src/frontend/blob.ts b/packages/common/nbstore/src/frontend/blob.tsindex 011234c4ca..620ce377b2 100644--- a/packages/common/nbstore/src/frontend/blob.ts+++ b/packages/common/nbstore/src/frontend/blob.ts@@ -15,6 +15,10 @@ export class BlobFrontend {return this.sync.state$;}+ blobState$(blobId: string) {+ return this.sync.blobState$(blobId);+ }+async get(blobId: string) {await this.waitForConnected();await using lock = await this.lock.lock('blob', blobId);diff --git a/packages/common/nbstore/src/sync/blob/index.ts b/packages/common/nbstore/src/sync/blob/index.tsindex b96edbba44..82b93f5799 100644--- a/packages/common/nbstore/src/sync/blob/index.ts+++ b/packages/common/nbstore/src/sync/blob/index.ts@@ -97,7 +97,7 @@ export class BlobSyncImpl implements BlobSync {return combineLatest(this.peers.map(peer => peer.blobPeerState$(blobId))).pipe(- throttleTime(1000),+ throttleTime(1000, undefined, { leading: true, trailing: true }),map(peers =>({diff --git a/packages/common/nbstore/src/sync/blob/peer.ts b/packages/common/nbstore/src/sync/blob/peer.tsindex 3dcdf49ac0..79858e5af1 100644--- a/packages/common/nbstore/src/sync/blob/peer.ts+++ b/packages/common/nbstore/src/sync/blob/peer.ts@@ -1,5 +1,5 @@import { difference } from 'lodash-es';-import { Observable, ReplaySubject, share, Subject } from 'rxjs';+import { filter, Observable, ReplaySubject, share, Subject } from 'rxjs';import type { BlobRecord, BlobStorage } from '../../storage';import { OverCapacityError, OverSizeError } from '../../storage';@@ -412,11 +412,13 @@ class BlobSyncPeerStatus {});};next();- const dispose = this.statusUpdatedSubject$.subscribe(updatedBlobId => {- if (updatedBlobId === blobId || updatedBlobId === true) {- next();- }- });+ const dispose = this.statusUpdatedSubject$+ .pipe(+ filter(+ updatedBlobId => updatedBlobId === blobId || updatedBlobId === true+ )+ )+ .subscribe(() => next());return () => {dispose.unsubscribe();};diff --git a/packages/common/nbstore/src/worker/client.ts b/packages/common/nbstore/src/worker/client.tsindex b179842a82..d9b104a2bd 100644--- a/packages/common/nbstore/src/worker/client.ts+++ b/packages/common/nbstore/src/worker/client.ts@@ -268,8 +268,8 @@ class WorkerBlobSync implements BlobSync {downloadBlob(blobId: string): Promise<boolean> {return this.client.call('blobSync.downloadBlob', blobId);}- uploadBlob(blob: BlobRecord): Promise<true> {- return this.client.call('blobSync.uploadBlob', blob);+ uploadBlob(blob: BlobRecord, force?: boolean): Promise<true> {+ return this.client.call('blobSync.uploadBlob', { blob, force });}fullDownload(peerId?: string, signal?: AbortSignal): Promise<void> {return new Promise((resolve, reject) => {diff --git a/packages/common/nbstore/src/worker/consumer.ts b/packages/common/nbstore/src/worker/consumer.tsindex 0fea4d91fe..f9105ec2d7 100644--- a/packages/common/nbstore/src/worker/consumer.ts+++ b/packages/common/nbstore/src/worker/consumer.ts@@ -216,7 +216,8 @@ class StoreConsumer {'blobSync.state': () => this.blobSync.state$,'blobSync.blobState': blobId => this.blobSync.blobState$(blobId),'blobSync.downloadBlob': key => this.blobSync.downloadBlob(key),- 'blobSync.uploadBlob': blob => this.blobSync.uploadBlob(blob),+ 'blobSync.uploadBlob': ({ blob, force }) =>+ this.blobSync.uploadBlob(blob, force),'blobSync.fullDownload': peerId =>new Observable(subscriber => {const abortController = new AbortController();diff --git a/packages/common/nbstore/src/worker/ops.ts b/packages/common/nbstore/src/worker/ops.tsindex 8e8730a369..a2e1a9ea14 100644--- a/packages/common/nbstore/src/worker/ops.ts+++ b/packages/common/nbstore/src/worker/ops.ts@@ -110,7 +110,7 @@ interface GroupedWorkerOps {state: [void, BlobSyncState];blobState: [string, BlobSyncBlobState];downloadBlob: [string, boolean];- uploadBlob: [BlobRecord, true];+ uploadBlob: [{ blob: BlobRecord; force?: boolean }, true];fullDownload: [string | null, void];};diff --git a/packages/frontend/core/src/modules/workspace/entities/workspace.ts b/packages/frontend/core/src/modules/workspace/entities/workspace.tsindex a99c19632f..27e2644e17 100644--- a/packages/frontend/core/src/modules/workspace/entities/workspace.ts+++ b/packages/frontend/core/src/modules/workspace/entities/workspace.ts@@ -46,6 +46,8 @@ export class Workspace extends Entity {});return id;},+ /* eslint-disable rxjs/finnish */+ blobState$: key => this.engine.blob.blobState$(key),name: 'blob',readonly: false,},