fix(ios): fix mobile blob storage (#8702)

This commit is contained in:
EYHN
2024-11-05 11:16:00 +00:00
parent c0d802a169
commit 4977055a2e
5 changed files with 60 additions and 37 deletions

View File

@@ -1,6 +1,6 @@
import { useDocMetaHelper } from '@affine/core/components/hooks/use-block-suite-page-meta';
import { useDocCollectionPage } from '@affine/core/components/hooks/use-block-suite-workspace-page';
import { FetchService } from '@affine/core/modules/cloud';
import { FetchService, GraphQLService } from '@affine/core/modules/cloud';
import { DebugLogger } from '@affine/debug';
import type { ListHistoryQuery } from '@affine/graphql';
import { listHistoryQuery, recoverDocMutation } from '@affine/graphql';
@@ -102,11 +102,16 @@ const docCollectionMap = new Map<string, DocCollection>();
// assume the workspace is a cloud workspace since the history feature is only enabled for cloud workspace
const getOrCreateShellWorkspace = (
workspaceId: string,
fetchService: FetchService
fetchService: FetchService,
graphQLService: GraphQLService
) => {
let docCollection = docCollectionMap.get(workspaceId);
if (!docCollection) {
const blobStorage = new CloudBlobStorage(workspaceId, fetchService);
const blobStorage = new CloudBlobStorage(
workspaceId,
fetchService,
graphQLService
);
docCollection = new DocCollection({
id: workspaceId,
blobSources: {
@@ -144,6 +149,7 @@ export const useSnapshotPage = (
ts?: string
) => {
const fetchService = useService(FetchService);
const graphQLService = useService(GraphQLService);
const snapshot = usePageHistory(docCollection.id, pageDocId, ts);
const page = useMemo(() => {
if (!ts) {
@@ -152,7 +158,8 @@ export const useSnapshotPage = (
const pageId = pageDocId + '-' + ts;
const historyShellWorkspace = getOrCreateShellWorkspace(
docCollection.id,
fetchService
fetchService,
graphQLService
);
let page = historyShellWorkspace.getDoc(pageId);
if (!page && snapshot) {
@@ -167,18 +174,19 @@ export const useSnapshotPage = (
}); // must load before applyUpdate
}
return page ?? undefined;
}, [ts, pageDocId, docCollection.id, fetchService, snapshot]);
}, [ts, pageDocId, docCollection.id, fetchService, graphQLService, snapshot]);
useEffect(() => {
const historyShellWorkspace = getOrCreateShellWorkspace(
docCollection.id,
fetchService
fetchService,
graphQLService
);
// apply the rootdoc's update to the current workspace
// this makes sure the page reference links are not deleted ones in the preview
const update = encodeStateAsUpdate(docCollection.doc);
applyUpdate(historyShellWorkspace.doc, update);
}, [docCollection, fetchService]);
}, [docCollection, fetchService, graphQLService]);
return page;
};

View File

@@ -6,7 +6,11 @@ import { useNavigateHelper } from '@affine/core/components/hooks/use-navigate-he
import { PageDetailEditor } from '@affine/core/components/page-detail-editor';
import { SharePageNotFoundError } from '@affine/core/components/share-page-not-found-error';
import { AppContainer } from '@affine/core/desktop/components/app-container';
import { AuthService, FetchService } from '@affine/core/modules/cloud';
import {
AuthService,
FetchService,
GraphQLService,
} from '@affine/core/modules/cloud';
import {
type Editor,
type EditorSelector,
@@ -147,7 +151,7 @@ const SharePageInner = ({
}) => {
const workspacesService = useService(WorkspacesService);
const fetchService = useService(FetchService);
const graphQLService = useService(GraphQLService);
const [workspace, setWorkspace] = useState<Workspace | null>(null);
const [page, setPage] = useState<Doc | null>(null);
const [editor, setEditor] = useState<Editor | null>(null);
@@ -181,7 +185,9 @@ const SharePageInner = ({
return EmptyBlobStorage;
},
getRemoteBlobStorages() {
return [new CloudBlobStorage(workspaceId, fetchService)];
return [
new CloudBlobStorage(workspaceId, fetchService, graphQLService),
];
},
}
);
@@ -221,6 +227,7 @@ const SharePageInner = ({
workspaceBinary,
docBinary,
fetchService,
graphQLService,
]);
const pageTitle = useLiveData(page?.title$);

View File

@@ -237,7 +237,11 @@ export class CloudWorkspaceFlavourProviderService
return localBlob;
}
const cloudBlob = new CloudBlobStorage(id, this.fetchService);
const cloudBlob = new CloudBlobStorage(
id,
this.fetchService,
this.graphqlService
);
return await cloudBlob.get(blob);
}
getEngineProvider(workspaceId: string): WorkspaceEngineProvider {
@@ -259,7 +263,11 @@ export class CloudWorkspaceFlavourProviderService
},
getRemoteBlobStorages: () => {
return [
new CloudBlobStorage(workspaceId, this.fetchService),
new CloudBlobStorage(
workspaceId,
this.fetchService,
this.graphqlService
),
new StaticBlobStorage(),
];
},

View File

@@ -1,7 +1,6 @@
import type { FetchService } from '@affine/core/modules/cloud';
import type { FetchService, GraphQLService } from '@affine/core/modules/cloud';
import {
deleteBlobMutation,
fetcher,
listBlobsQuery,
setBlobMutation,
UserFriendlyError,
@@ -14,7 +13,8 @@ import { bufferToBlob } from '../../utils/buffer-to-blob';
export class CloudBlobStorage implements BlobStorage {
constructor(
private readonly workspaceId: string,
private readonly fetchService: FetchService
private readonly fetchService: FetchService,
private readonly gqlService: GraphQLService
) {}
name = 'cloud';
@@ -46,13 +46,14 @@ export class CloudBlobStorage implements BlobStorage {
async set(key: string, value: Blob) {
// set blob will check blob size & quota
return await fetcher({
query: setBlobMutation,
variables: {
workspaceId: this.workspaceId,
blob: new File([value], key),
},
})
return await this.gqlService
.gql({
query: setBlobMutation,
variables: {
workspaceId: this.workspaceId,
blob: new File([value], key),
},
})
.then(res => res.setBlob)
.catch(err => {
const error = UserFriendlyError.fromAnyError(err);
@@ -65,7 +66,7 @@ export class CloudBlobStorage implements BlobStorage {
}
async delete(key: string) {
await fetcher({
await this.gqlService.gql({
query: deleteBlobMutation,
variables: {
workspaceId: key,
@@ -75,7 +76,7 @@ export class CloudBlobStorage implements BlobStorage {
}
async list() {
const result = await fetcher({
const result = await this.gqlService.gql({
query: listBlobsQuery,
variables: {
workspaceId: this.workspaceId,