diff --git a/.github/helm/affine/Chart.yaml b/.github/helm/affine/Chart.yaml index c57621d475..2ae11c9a73 100644 --- a/.github/helm/affine/Chart.yaml +++ b/.github/helm/affine/Chart.yaml @@ -3,4 +3,4 @@ name: affine description: AFFiNE cloud chart type: application version: 0.0.0 -appVersion: "0.27.0" +appVersion: "0.27.5" diff --git a/.github/helm/affine/charts/front/Chart.yaml b/.github/helm/affine/charts/front/Chart.yaml index 8c888569c1..9fec0dda2b 100644 --- a/.github/helm/affine/charts/front/Chart.yaml +++ b/.github/helm/affine/charts/front/Chart.yaml @@ -3,7 +3,7 @@ name: front description: AFFiNE front server type: application version: 0.0.0 -appVersion: "0.27.0" +appVersion: "0.27.5" dependencies: - name: gcloud-sql-proxy version: 0.0.0 diff --git a/.github/helm/affine/charts/graphql/Chart.yaml b/.github/helm/affine/charts/graphql/Chart.yaml index efe885403b..36293f15de 100644 --- a/.github/helm/affine/charts/graphql/Chart.yaml +++ b/.github/helm/affine/charts/graphql/Chart.yaml @@ -3,7 +3,7 @@ name: graphql description: AFFiNE GraphQL server type: application version: 0.0.0 -appVersion: "0.27.0" +appVersion: "0.27.5" dependencies: - name: gcloud-sql-proxy version: 0.0.0 diff --git a/Cargo.lock b/Cargo.lock index d70dc18779..6fab3f0b88 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3109,7 +3109,7 @@ dependencies = [ "libc", "log", "rustversion", - "windows-link 0.2.1", + "windows-link 0.1.3", "windows-result 0.4.1", ] @@ -4933,9 +4933,9 @@ dependencies = [ [[package]] name = "llm_adapter" -version = "0.2.23" +version = "0.2.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd18d17c60b800981d83224309ff9ce6b4093ae12929f2baad77dd5208383bdc" +checksum = "2ffd1c4caf6e911d0d756c195854b8e2665a574c7bd30edddebcabea6a0542b8" dependencies = [ "base64 0.22.1", "jsonschema", @@ -10627,7 +10627,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.48.0", ] [[package]] diff --git a/blocksuite/affine/all/package.json b/blocksuite/affine/all/package.json index ac35786466..8ecdf0fdc3 100644 --- a/blocksuite/affine/all/package.json +++ b/blocksuite/affine/all/package.json @@ -295,7 +295,7 @@ "!src/__tests__", "!dist/__tests__" ], - "version": "0.27.0", + "version": "0.27.5", "devDependencies": { "@vanilla-extract/vite-plugin": "^5.0.0", "msw": "^2.13.2", diff --git a/blocksuite/affine/blocks/attachment/package.json b/blocksuite/affine/blocks/attachment/package.json index 447646e20e..e3caf31348 100644 --- a/blocksuite/affine/blocks/attachment/package.json +++ b/blocksuite/affine/blocks/attachment/package.json @@ -37,5 +37,5 @@ "!src/__tests__", "!dist/__tests__" ], - "version": "0.27.0" + "version": "0.27.5" } diff --git a/blocksuite/affine/blocks/bookmark/package.json b/blocksuite/affine/blocks/bookmark/package.json index 4fd68589d2..ab980fa895 100644 --- a/blocksuite/affine/blocks/bookmark/package.json +++ b/blocksuite/affine/blocks/bookmark/package.json @@ -44,5 +44,5 @@ "!src/__tests__", "!dist/__tests__" ], - "version": "0.27.0" + "version": "0.27.5" } diff --git a/blocksuite/affine/blocks/callout/package.json b/blocksuite/affine/blocks/callout/package.json index 3af1243b99..50ae95f9c2 100644 --- a/blocksuite/affine/blocks/callout/package.json +++ b/blocksuite/affine/blocks/callout/package.json @@ -36,5 +36,5 @@ "!src/__tests__", "!dist/__tests__" ], - "version": "0.27.0" + "version": "0.27.5" } diff --git a/blocksuite/affine/blocks/code/package.json b/blocksuite/affine/blocks/code/package.json index 68fe44ae82..38473ddade 100644 --- a/blocksuite/affine/blocks/code/package.json +++ b/blocksuite/affine/blocks/code/package.json @@ -44,5 +44,5 @@ "!src/__tests__", "!dist/__tests__" ], - "version": "0.27.0" + "version": "0.27.5" } diff --git a/blocksuite/affine/blocks/data-view/package.json b/blocksuite/affine/blocks/data-view/package.json index f6dabcb671..d0b1b3b70b 100644 --- a/blocksuite/affine/blocks/data-view/package.json +++ b/blocksuite/affine/blocks/data-view/package.json @@ -36,5 +36,5 @@ "!src/__tests__", "!dist/__tests__" ], - "version": "0.27.0" + "version": "0.27.5" } diff --git a/blocksuite/affine/blocks/database/package.json b/blocksuite/affine/blocks/database/package.json index efba1524e2..b8dc12f242 100644 --- a/blocksuite/affine/blocks/database/package.json +++ b/blocksuite/affine/blocks/database/package.json @@ -45,5 +45,5 @@ "!src/__tests__", "!dist/__tests__" ], - "version": "0.27.0" + "version": "0.27.5" } diff --git a/blocksuite/affine/blocks/divider/package.json b/blocksuite/affine/blocks/divider/package.json index 0f61f6f57d..cd7c6aa65b 100644 --- a/blocksuite/affine/blocks/divider/package.json +++ b/blocksuite/affine/blocks/divider/package.json @@ -31,5 +31,5 @@ "!src/__tests__", "!dist/__tests__" ], - "version": "0.27.0" + "version": "0.27.5" } diff --git a/blocksuite/affine/blocks/edgeless-text/package.json b/blocksuite/affine/blocks/edgeless-text/package.json index 0e1137726e..c37ff9ef42 100644 --- a/blocksuite/affine/blocks/edgeless-text/package.json +++ b/blocksuite/affine/blocks/edgeless-text/package.json @@ -34,5 +34,5 @@ "!src/__tests__", "!dist/__tests__" ], - "version": "0.27.0" + "version": "0.27.5" } diff --git a/blocksuite/affine/blocks/embed-doc/package.json b/blocksuite/affine/blocks/embed-doc/package.json index 07cac07ed6..3b54219f0d 100644 --- a/blocksuite/affine/blocks/embed-doc/package.json +++ b/blocksuite/affine/blocks/embed-doc/package.json @@ -41,5 +41,5 @@ "!src/__tests__", "!dist/__tests__" ], - "version": "0.27.0" + "version": "0.27.5" } diff --git a/blocksuite/affine/blocks/embed/package.json b/blocksuite/affine/blocks/embed/package.json index b6f9c5eb1e..b7ad891b1b 100644 --- a/blocksuite/affine/blocks/embed/package.json +++ b/blocksuite/affine/blocks/embed/package.json @@ -37,5 +37,5 @@ "!src/__tests__", "!dist/__tests__" ], - "version": "0.27.0" + "version": "0.27.5" } diff --git a/blocksuite/affine/blocks/frame/package.json b/blocksuite/affine/blocks/frame/package.json index d17de56d5c..98fe0913b6 100644 --- a/blocksuite/affine/blocks/frame/package.json +++ b/blocksuite/affine/blocks/frame/package.json @@ -38,5 +38,5 @@ "!src/__tests__", "!dist/__tests__" ], - "version": "0.27.0" + "version": "0.27.5" } diff --git a/blocksuite/affine/blocks/image/package.json b/blocksuite/affine/blocks/image/package.json index a7b7d24737..e42154c0ae 100644 --- a/blocksuite/affine/blocks/image/package.json +++ b/blocksuite/affine/blocks/image/package.json @@ -39,5 +39,5 @@ "!src/__tests__", "!dist/__tests__" ], - "version": "0.27.0" + "version": "0.27.5" } diff --git a/blocksuite/affine/blocks/latex/package.json b/blocksuite/affine/blocks/latex/package.json index 3440f4fb4d..d69c4b42b4 100644 --- a/blocksuite/affine/blocks/latex/package.json +++ b/blocksuite/affine/blocks/latex/package.json @@ -37,5 +37,5 @@ "!src/__tests__", "!dist/__tests__" ], - "version": "0.27.0" + "version": "0.27.5" } diff --git a/blocksuite/affine/blocks/list/package.json b/blocksuite/affine/blocks/list/package.json index 46f3cb8c3c..fdaf6f741e 100644 --- a/blocksuite/affine/blocks/list/package.json +++ b/blocksuite/affine/blocks/list/package.json @@ -37,5 +37,5 @@ "!src/__tests__", "!dist/__tests__" ], - "version": "0.27.0" + "version": "0.27.5" } diff --git a/blocksuite/affine/blocks/note/package.json b/blocksuite/affine/blocks/note/package.json index ea05889924..47462c04c9 100644 --- a/blocksuite/affine/blocks/note/package.json +++ b/blocksuite/affine/blocks/note/package.json @@ -47,5 +47,5 @@ "!src/__tests__", "!dist/__tests__" ], - "version": "0.27.0" + "version": "0.27.5" } diff --git a/blocksuite/affine/blocks/paragraph/package.json b/blocksuite/affine/blocks/paragraph/package.json index 2d9df77833..e5bece251c 100644 --- a/blocksuite/affine/blocks/paragraph/package.json +++ b/blocksuite/affine/blocks/paragraph/package.json @@ -38,5 +38,5 @@ "!src/__tests__", "!dist/__tests__" ], - "version": "0.27.0" + "version": "0.27.5" } diff --git a/blocksuite/affine/blocks/root/package.json b/blocksuite/affine/blocks/root/package.json index 9b228af155..28351b008d 100644 --- a/blocksuite/affine/blocks/root/package.json +++ b/blocksuite/affine/blocks/root/package.json @@ -61,5 +61,5 @@ "!src/__tests__", "!dist/__tests__" ], - "version": "0.27.0" + "version": "0.27.5" } diff --git a/blocksuite/affine/blocks/surface-ref/package.json b/blocksuite/affine/blocks/surface-ref/package.json index 7e0edf8ace..0c58b95b8f 100644 --- a/blocksuite/affine/blocks/surface-ref/package.json +++ b/blocksuite/affine/blocks/surface-ref/package.json @@ -36,5 +36,5 @@ "!src/__tests__", "!dist/__tests__" ], - "version": "0.27.0" + "version": "0.27.5" } diff --git a/blocksuite/affine/blocks/surface/package.json b/blocksuite/affine/blocks/surface/package.json index 636fe91133..e7db9932c0 100644 --- a/blocksuite/affine/blocks/surface/package.json +++ b/blocksuite/affine/blocks/surface/package.json @@ -41,5 +41,5 @@ "!src/__tests__", "!dist/__tests__" ], - "version": "0.27.0" + "version": "0.27.5" } diff --git a/blocksuite/affine/blocks/table/package.json b/blocksuite/affine/blocks/table/package.json index 5c628949eb..c06eb4b51b 100644 --- a/blocksuite/affine/blocks/table/package.json +++ b/blocksuite/affine/blocks/table/package.json @@ -38,5 +38,5 @@ "!src/__tests__", "!dist/__tests__" ], - "version": "0.27.0" + "version": "0.27.5" } diff --git a/blocksuite/affine/components/package.json b/blocksuite/affine/components/package.json index 3abfe319ab..f464b6f765 100644 --- a/blocksuite/affine/components/package.json +++ b/blocksuite/affine/components/package.json @@ -74,5 +74,5 @@ "!src/__tests__", "!dist/__tests__" ], - "version": "0.27.0" + "version": "0.27.5" } diff --git a/blocksuite/affine/data-view/package.json b/blocksuite/affine/data-view/package.json index 5f6e695b3a..2c5a92e977 100644 --- a/blocksuite/affine/data-view/package.json +++ b/blocksuite/affine/data-view/package.json @@ -46,5 +46,5 @@ "!src/__tests__", "!dist/__tests__" ], - "version": "0.27.0" + "version": "0.27.5" } diff --git a/blocksuite/affine/ext-loader/package.json b/blocksuite/affine/ext-loader/package.json index 156e7e48d7..86997cf841 100644 --- a/blocksuite/affine/ext-loader/package.json +++ b/blocksuite/affine/ext-loader/package.json @@ -26,5 +26,5 @@ "!src/__tests__", "!dist/__tests__" ], - "version": "0.27.0" + "version": "0.27.5" } diff --git a/blocksuite/affine/foundation/package.json b/blocksuite/affine/foundation/package.json index a5d5941834..22ddff9442 100644 --- a/blocksuite/affine/foundation/package.json +++ b/blocksuite/affine/foundation/package.json @@ -31,5 +31,5 @@ "!src/__tests__", "!dist/__tests__" ], - "version": "0.27.0" + "version": "0.27.5" } diff --git a/blocksuite/affine/fragments/adapter-panel/package.json b/blocksuite/affine/fragments/adapter-panel/package.json index 86dd5dc03a..96e8f21889 100644 --- a/blocksuite/affine/fragments/adapter-panel/package.json +++ b/blocksuite/affine/fragments/adapter-panel/package.json @@ -32,5 +32,5 @@ "!src/__tests__", "!dist/__tests__" ], - "version": "0.27.0" + "version": "0.27.5" } diff --git a/blocksuite/affine/fragments/doc-title/package.json b/blocksuite/affine/fragments/doc-title/package.json index aa687f8179..bff4bc91d6 100644 --- a/blocksuite/affine/fragments/doc-title/package.json +++ b/blocksuite/affine/fragments/doc-title/package.json @@ -30,5 +30,5 @@ "!src/__tests__", "!dist/__tests__" ], - "version": "0.27.0" + "version": "0.27.5" } diff --git a/blocksuite/affine/fragments/frame-panel/package.json b/blocksuite/affine/fragments/frame-panel/package.json index c302ccaace..f064ddda3a 100644 --- a/blocksuite/affine/fragments/frame-panel/package.json +++ b/blocksuite/affine/fragments/frame-panel/package.json @@ -35,5 +35,5 @@ "!src/__tests__", "!dist/__tests__" ], - "version": "0.27.0" + "version": "0.27.5" } diff --git a/blocksuite/affine/fragments/outline/package.json b/blocksuite/affine/fragments/outline/package.json index 7e1d3b5fb0..5c79f8f776 100644 --- a/blocksuite/affine/fragments/outline/package.json +++ b/blocksuite/affine/fragments/outline/package.json @@ -35,5 +35,5 @@ "!src/__tests__", "!dist/__tests__" ], - "version": "0.27.0" + "version": "0.27.5" } diff --git a/blocksuite/affine/gfx/brush/package.json b/blocksuite/affine/gfx/brush/package.json index 8218c87cca..bf4c794f30 100644 --- a/blocksuite/affine/gfx/brush/package.json +++ b/blocksuite/affine/gfx/brush/package.json @@ -32,5 +32,5 @@ "!src/__tests__", "!dist/__tests__" ], - "version": "0.27.0" + "version": "0.27.5" } diff --git a/blocksuite/affine/gfx/connector/package.json b/blocksuite/affine/gfx/connector/package.json index 3be93311f7..65e8620915 100644 --- a/blocksuite/affine/gfx/connector/package.json +++ b/blocksuite/affine/gfx/connector/package.json @@ -40,5 +40,5 @@ "!src/__tests__", "!dist/__tests__" ], - "version": "0.27.0" + "version": "0.27.5" } diff --git a/blocksuite/affine/gfx/group/package.json b/blocksuite/affine/gfx/group/package.json index 3881b335cd..c0aab9b6cc 100644 --- a/blocksuite/affine/gfx/group/package.json +++ b/blocksuite/affine/gfx/group/package.json @@ -39,5 +39,5 @@ "!src/__tests__", "!dist/__tests__" ], - "version": "0.27.0" + "version": "0.27.5" } diff --git a/blocksuite/affine/gfx/link/package.json b/blocksuite/affine/gfx/link/package.json index b5056ba69f..cac7f3baa3 100644 --- a/blocksuite/affine/gfx/link/package.json +++ b/blocksuite/affine/gfx/link/package.json @@ -30,5 +30,5 @@ "!src/__tests__", "!dist/__tests__" ], - "version": "0.27.0" + "version": "0.27.5" } diff --git a/blocksuite/affine/gfx/mindmap/package.json b/blocksuite/affine/gfx/mindmap/package.json index b972eb2d55..959c2eecc5 100644 --- a/blocksuite/affine/gfx/mindmap/package.json +++ b/blocksuite/affine/gfx/mindmap/package.json @@ -45,5 +45,5 @@ "!src/__tests__", "!dist/__tests__" ], - "version": "0.27.0" + "version": "0.27.5" } diff --git a/blocksuite/affine/gfx/note/package.json b/blocksuite/affine/gfx/note/package.json index 2389e85bd0..a245ff5212 100644 --- a/blocksuite/affine/gfx/note/package.json +++ b/blocksuite/affine/gfx/note/package.json @@ -37,5 +37,5 @@ "!src/__tests__", "!dist/__tests__" ], - "version": "0.27.0" + "version": "0.27.5" } diff --git a/blocksuite/affine/gfx/pointer/package.json b/blocksuite/affine/gfx/pointer/package.json index dd4a4af52c..a584f2ea6a 100644 --- a/blocksuite/affine/gfx/pointer/package.json +++ b/blocksuite/affine/gfx/pointer/package.json @@ -34,5 +34,5 @@ "!src/__tests__", "!dist/__tests__" ], - "version": "0.27.0" + "version": "0.27.5" } diff --git a/blocksuite/affine/gfx/shape/package.json b/blocksuite/affine/gfx/shape/package.json index 16f2c87e27..65dae7ad4e 100644 --- a/blocksuite/affine/gfx/shape/package.json +++ b/blocksuite/affine/gfx/shape/package.json @@ -41,5 +41,5 @@ "!src/__tests__", "!dist/__tests__" ], - "version": "0.27.0" + "version": "0.27.5" } diff --git a/blocksuite/affine/gfx/template/package.json b/blocksuite/affine/gfx/template/package.json index 881f399544..845bc470ba 100644 --- a/blocksuite/affine/gfx/template/package.json +++ b/blocksuite/affine/gfx/template/package.json @@ -35,5 +35,5 @@ "!src/__tests__", "!dist/__tests__" ], - "version": "0.27.0" + "version": "0.27.5" } diff --git a/blocksuite/affine/gfx/text/package.json b/blocksuite/affine/gfx/text/package.json index a29d6ab0dd..7bc38907e6 100644 --- a/blocksuite/affine/gfx/text/package.json +++ b/blocksuite/affine/gfx/text/package.json @@ -36,5 +36,5 @@ "!src/__tests__", "!dist/__tests__" ], - "version": "0.27.0" + "version": "0.27.5" } diff --git a/blocksuite/affine/gfx/turbo-renderer/package.json b/blocksuite/affine/gfx/turbo-renderer/package.json index 90e08a86bd..4cfb070113 100644 --- a/blocksuite/affine/gfx/turbo-renderer/package.json +++ b/blocksuite/affine/gfx/turbo-renderer/package.json @@ -26,5 +26,5 @@ "!src/__tests__", "!dist/__tests__" ], - "version": "0.27.0" + "version": "0.27.5" } diff --git a/blocksuite/affine/inlines/comment/package.json b/blocksuite/affine/inlines/comment/package.json index 4391076fa4..20e110530a 100644 --- a/blocksuite/affine/inlines/comment/package.json +++ b/blocksuite/affine/inlines/comment/package.json @@ -35,5 +35,5 @@ "!src/__tests__", "!dist/__tests__" ], - "version": "0.27.0" + "version": "0.27.5" } diff --git a/blocksuite/affine/inlines/footnote/package.json b/blocksuite/affine/inlines/footnote/package.json index 8cd6d77067..e9841420c8 100644 --- a/blocksuite/affine/inlines/footnote/package.json +++ b/blocksuite/affine/inlines/footnote/package.json @@ -40,5 +40,5 @@ "!src/__tests__", "!dist/__tests__" ], - "version": "0.27.0" + "version": "0.27.5" } diff --git a/blocksuite/affine/inlines/latex/package.json b/blocksuite/affine/inlines/latex/package.json index cea9dc9335..7bd5797533 100644 --- a/blocksuite/affine/inlines/latex/package.json +++ b/blocksuite/affine/inlines/latex/package.json @@ -38,5 +38,5 @@ "!src/__tests__", "!dist/__tests__" ], - "version": "0.27.0" + "version": "0.27.5" } diff --git a/blocksuite/affine/inlines/link/package.json b/blocksuite/affine/inlines/link/package.json index 76638f4a8e..9664335657 100644 --- a/blocksuite/affine/inlines/link/package.json +++ b/blocksuite/affine/inlines/link/package.json @@ -36,5 +36,5 @@ "!src/__tests__", "!dist/__tests__" ], - "version": "0.27.0" + "version": "0.27.5" } diff --git a/blocksuite/affine/inlines/mention/package.json b/blocksuite/affine/inlines/mention/package.json index 8bdde01d1e..fcf2a712ec 100644 --- a/blocksuite/affine/inlines/mention/package.json +++ b/blocksuite/affine/inlines/mention/package.json @@ -28,5 +28,5 @@ "!src/__tests__", "!dist/__tests__" ], - "version": "0.27.0" + "version": "0.27.5" } diff --git a/blocksuite/affine/inlines/preset/package.json b/blocksuite/affine/inlines/preset/package.json index 36fdbe0ca8..fac1e3c61f 100644 --- a/blocksuite/affine/inlines/preset/package.json +++ b/blocksuite/affine/inlines/preset/package.json @@ -41,5 +41,5 @@ "!src/__tests__", "!dist/__tests__" ], - "version": "0.27.0" + "version": "0.27.5" } diff --git a/blocksuite/affine/inlines/reference/package.json b/blocksuite/affine/inlines/reference/package.json index 52ec31385c..326fe493c2 100644 --- a/blocksuite/affine/inlines/reference/package.json +++ b/blocksuite/affine/inlines/reference/package.json @@ -36,5 +36,5 @@ "!src/__tests__", "!dist/__tests__" ], - "version": "0.27.0" + "version": "0.27.5" } diff --git a/blocksuite/affine/model/package.json b/blocksuite/affine/model/package.json index 2936b3d997..b729c4e39d 100644 --- a/blocksuite/affine/model/package.json +++ b/blocksuite/affine/model/package.json @@ -29,5 +29,5 @@ "!src/__tests__", "!dist/__tests__" ], - "version": "0.27.0" + "version": "0.27.5" } diff --git a/blocksuite/affine/rich-text/package.json b/blocksuite/affine/rich-text/package.json index d24f27374b..130086dc01 100644 --- a/blocksuite/affine/rich-text/package.json +++ b/blocksuite/affine/rich-text/package.json @@ -32,5 +32,5 @@ "!src/__tests__", "!dist/__tests__" ], - "version": "0.27.0" + "version": "0.27.5" } diff --git a/blocksuite/affine/shared/package.json b/blocksuite/affine/shared/package.json index 49833609ed..4016f32a54 100644 --- a/blocksuite/affine/shared/package.json +++ b/blocksuite/affine/shared/package.json @@ -76,5 +76,5 @@ "@types/pdfmake": "^0.2.12", "vitest": "^4.1.8" }, - "version": "0.27.0" + "version": "0.27.5" } diff --git a/blocksuite/affine/widgets/drag-handle/package.json b/blocksuite/affine/widgets/drag-handle/package.json index 2936ca1d2d..f83203e6db 100644 --- a/blocksuite/affine/widgets/drag-handle/package.json +++ b/blocksuite/affine/widgets/drag-handle/package.json @@ -40,5 +40,5 @@ "!src/__tests__", "!dist/__tests__" ], - "version": "0.27.0" + "version": "0.27.5" } diff --git a/blocksuite/affine/widgets/edgeless-auto-connect/package.json b/blocksuite/affine/widgets/edgeless-auto-connect/package.json index 3bbd2a4dc1..c8e2365e19 100644 --- a/blocksuite/affine/widgets/edgeless-auto-connect/package.json +++ b/blocksuite/affine/widgets/edgeless-auto-connect/package.json @@ -30,5 +30,5 @@ "!src/__tests__", "!dist/__tests__" ], - "version": "0.27.0" + "version": "0.27.5" } diff --git a/blocksuite/affine/widgets/edgeless-dragging-area/package.json b/blocksuite/affine/widgets/edgeless-dragging-area/package.json index 90daf6f8b4..16313a4bf2 100644 --- a/blocksuite/affine/widgets/edgeless-dragging-area/package.json +++ b/blocksuite/affine/widgets/edgeless-dragging-area/package.json @@ -27,5 +27,5 @@ "!src/__tests__", "!dist/__tests__" ], - "version": "0.27.0" + "version": "0.27.5" } diff --git a/blocksuite/affine/widgets/edgeless-selected-rect/package.json b/blocksuite/affine/widgets/edgeless-selected-rect/package.json index 8dfea0f52b..15524025d3 100644 --- a/blocksuite/affine/widgets/edgeless-selected-rect/package.json +++ b/blocksuite/affine/widgets/edgeless-selected-rect/package.json @@ -37,5 +37,5 @@ "!src/__tests__", "!dist/__tests__" ], - "version": "0.27.0" + "version": "0.27.5" } diff --git a/blocksuite/affine/widgets/edgeless-toolbar/package.json b/blocksuite/affine/widgets/edgeless-toolbar/package.json index d82e8064f7..74c8af661e 100644 --- a/blocksuite/affine/widgets/edgeless-toolbar/package.json +++ b/blocksuite/affine/widgets/edgeless-toolbar/package.json @@ -37,5 +37,5 @@ "!src/__tests__", "!dist/__tests__" ], - "version": "0.27.0" + "version": "0.27.5" } diff --git a/blocksuite/affine/widgets/edgeless-zoom-toolbar/package.json b/blocksuite/affine/widgets/edgeless-zoom-toolbar/package.json index 4e25ae791b..5bfcb865fb 100644 --- a/blocksuite/affine/widgets/edgeless-zoom-toolbar/package.json +++ b/blocksuite/affine/widgets/edgeless-zoom-toolbar/package.json @@ -35,5 +35,5 @@ "!src/__tests__", "!dist/__tests__" ], - "version": "0.27.0" + "version": "0.27.5" } diff --git a/blocksuite/affine/widgets/frame-title/package.json b/blocksuite/affine/widgets/frame-title/package.json index bb61ff0434..c6f5678f55 100644 --- a/blocksuite/affine/widgets/frame-title/package.json +++ b/blocksuite/affine/widgets/frame-title/package.json @@ -32,5 +32,5 @@ "!src/__tests__", "!dist/__tests__" ], - "version": "0.27.0" + "version": "0.27.5" } diff --git a/blocksuite/affine/widgets/keyboard-toolbar/package.json b/blocksuite/affine/widgets/keyboard-toolbar/package.json index 8571c20f9b..6d7d35ca41 100644 --- a/blocksuite/affine/widgets/keyboard-toolbar/package.json +++ b/blocksuite/affine/widgets/keyboard-toolbar/package.json @@ -48,5 +48,5 @@ "!src/__tests__", "!dist/__tests__" ], - "version": "0.27.0" + "version": "0.27.5" } diff --git a/blocksuite/affine/widgets/linked-doc/package.json b/blocksuite/affine/widgets/linked-doc/package.json index bc8e387480..62d3e4a08a 100644 --- a/blocksuite/affine/widgets/linked-doc/package.json +++ b/blocksuite/affine/widgets/linked-doc/package.json @@ -44,5 +44,5 @@ "!src/__tests__", "!dist/__tests__" ], - "version": "0.27.0" + "version": "0.27.5" } diff --git a/blocksuite/affine/widgets/note-slicer/package.json b/blocksuite/affine/widgets/note-slicer/package.json index 3f4da4d582..96dbb0e8f4 100644 --- a/blocksuite/affine/widgets/note-slicer/package.json +++ b/blocksuite/affine/widgets/note-slicer/package.json @@ -31,5 +31,5 @@ "!src/__tests__", "!dist/__tests__" ], - "version": "0.27.0" + "version": "0.27.5" } diff --git a/blocksuite/affine/widgets/page-dragging-area/package.json b/blocksuite/affine/widgets/page-dragging-area/package.json index 25d0e67c53..5dd54d654f 100644 --- a/blocksuite/affine/widgets/page-dragging-area/package.json +++ b/blocksuite/affine/widgets/page-dragging-area/package.json @@ -26,5 +26,5 @@ "!src/__tests__", "!dist/__tests__" ], - "version": "0.27.0" + "version": "0.27.5" } diff --git a/blocksuite/affine/widgets/remote-selection/package.json b/blocksuite/affine/widgets/remote-selection/package.json index 4df18e4926..e4b55ed92e 100644 --- a/blocksuite/affine/widgets/remote-selection/package.json +++ b/blocksuite/affine/widgets/remote-selection/package.json @@ -31,5 +31,5 @@ "!src/__tests__", "!dist/__tests__" ], - "version": "0.27.0" + "version": "0.27.5" } diff --git a/blocksuite/affine/widgets/scroll-anchoring/package.json b/blocksuite/affine/widgets/scroll-anchoring/package.json index ced63ec82b..cd042cda6b 100644 --- a/blocksuite/affine/widgets/scroll-anchoring/package.json +++ b/blocksuite/affine/widgets/scroll-anchoring/package.json @@ -29,5 +29,5 @@ "!src/__tests__", "!dist/__tests__" ], - "version": "0.27.0" + "version": "0.27.5" } diff --git a/blocksuite/affine/widgets/slash-menu/package.json b/blocksuite/affine/widgets/slash-menu/package.json index f3340af2d9..4a1852c72c 100644 --- a/blocksuite/affine/widgets/slash-menu/package.json +++ b/blocksuite/affine/widgets/slash-menu/package.json @@ -34,5 +34,5 @@ "!src/__tests__", "!dist/__tests__" ], - "version": "0.27.0" + "version": "0.27.5" } diff --git a/blocksuite/affine/widgets/toolbar/package.json b/blocksuite/affine/widgets/toolbar/package.json index 484e60b2f1..bedb43417c 100644 --- a/blocksuite/affine/widgets/toolbar/package.json +++ b/blocksuite/affine/widgets/toolbar/package.json @@ -36,5 +36,5 @@ "!src/__tests__", "!dist/__tests__" ], - "version": "0.27.0" + "version": "0.27.5" } diff --git a/blocksuite/affine/widgets/viewport-overlay/package.json b/blocksuite/affine/widgets/viewport-overlay/package.json index f77471f1bd..acbbd60910 100644 --- a/blocksuite/affine/widgets/viewport-overlay/package.json +++ b/blocksuite/affine/widgets/viewport-overlay/package.json @@ -25,5 +25,5 @@ "!src/__tests__", "!dist/__tests__" ], - "version": "0.27.0" + "version": "0.27.5" } diff --git a/blocksuite/docs-site/package.json b/blocksuite/docs-site/package.json index 46ccaaae67..c370b757e3 100644 --- a/blocksuite/docs-site/package.json +++ b/blocksuite/docs-site/package.json @@ -29,5 +29,5 @@ "vitepress": "^1.6.4", "vue": "^3.4.38" }, - "version": "0.27.0" + "version": "0.27.5" } diff --git a/blocksuite/docs/package.json b/blocksuite/docs/package.json index ca26141b4c..f75fe3fbaa 100644 --- a/blocksuite/docs/package.json +++ b/blocksuite/docs/package.json @@ -14,5 +14,5 @@ "scripts": { "build": "typedoc" }, - "version": "0.27.0" + "version": "0.27.5" } diff --git a/blocksuite/framework/global/package.json b/blocksuite/framework/global/package.json index 72b35cc10f..8014e27352 100644 --- a/blocksuite/framework/global/package.json +++ b/blocksuite/framework/global/package.json @@ -63,5 +63,5 @@ "devDependencies": { "vitest": "^4.1.8" }, - "version": "0.27.0" + "version": "0.27.5" } diff --git a/blocksuite/framework/std/package.json b/blocksuite/framework/std/package.json index e006b6c1a1..81eeae99a2 100644 --- a/blocksuite/framework/std/package.json +++ b/blocksuite/framework/std/package.json @@ -49,5 +49,5 @@ "!src/__tests__", "!dist/__tests__" ], - "version": "0.27.0" + "version": "0.27.5" } diff --git a/blocksuite/framework/store/package.json b/blocksuite/framework/store/package.json index 4173c24496..636330586a 100644 --- a/blocksuite/framework/store/package.json +++ b/blocksuite/framework/store/package.json @@ -38,5 +38,5 @@ "!dist/__tests__", "shim.d.ts" ], - "version": "0.27.0" + "version": "0.27.5" } diff --git a/blocksuite/framework/sync/package.json b/blocksuite/framework/sync/package.json index e7a66ac270..0bf7612fa5 100644 --- a/blocksuite/framework/sync/package.json +++ b/blocksuite/framework/sync/package.json @@ -33,5 +33,5 @@ "!src/__tests__", "!dist/__tests__" ], - "version": "0.27.0" + "version": "0.27.5" } diff --git a/blocksuite/integration-test/package.json b/blocksuite/integration-test/package.json index a2f4de3fb6..13ac7add64 100644 --- a/blocksuite/integration-test/package.json +++ b/blocksuite/integration-test/package.json @@ -41,5 +41,5 @@ "vite-plugin-wasm": "^3.5.0", "vitest": "^4.1.8" }, - "version": "0.27.0" + "version": "0.27.5" } diff --git a/blocksuite/playground/package.json b/blocksuite/playground/package.json index 37e60d3721..a6fc512297 100644 --- a/blocksuite/playground/package.json +++ b/blocksuite/playground/package.json @@ -39,5 +39,5 @@ "vite-plugin-wasm": "^3.5.0", "vite-plugin-web-components-hmr": "^0.1.3" }, - "version": "0.27.0" + "version": "0.27.5" } diff --git a/docs/reference/package.json b/docs/reference/package.json index 4b6dc49349..971c73a726 100644 --- a/docs/reference/package.json +++ b/docs/reference/package.json @@ -19,5 +19,5 @@ ], "ext": "ts,md,json" }, - "version": "0.27.0" + "version": "0.27.5" } diff --git a/package.json b/package.json index aa1ddba893..b9ed4e921f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@affine/monorepo", - "version": "0.27.0", + "version": "0.27.5", "private": true, "author": "toeverything", "license": "MIT", diff --git a/packages/backend/native/package.json b/packages/backend/native/package.json index 2c8dd200fe..2ddc0bff7c 100644 --- a/packages/backend/native/package.json +++ b/packages/backend/native/package.json @@ -1,6 +1,6 @@ { "name": "@affine/server-native", - "version": "0.27.0", + "version": "0.27.5", "engines": { "node": ">= 10.16.0 < 11 || >= 11.8.0" }, diff --git a/packages/backend/native/src/runtime/backend_runtime/doc_writer.rs b/packages/backend/native/src/runtime/backend_runtime/doc_writer.rs index 8022e78df4..898e7b4e25 100644 --- a/packages/backend/native/src/runtime/backend_runtime/doc_writer.rs +++ b/packages/backend/native/src/runtime/backend_runtime/doc_writer.rs @@ -1,6 +1,8 @@ use std::sync::Arc; -use affine_core::access_control::DomainCommand; +use affine_core::access_control::{ + DomainCommand, ReservedDocumentAccessDecision, authorize_reserved_document, classify_reserved_document, +}; use chrono::Duration; use napi::{Result, bindgen_prelude::Buffer}; use sqlx::PgPool; @@ -110,7 +112,17 @@ async fn append_authorized_updates( .map_err(super::to_napi_error)?; } let authorizer = PermissionAuthorizer::with_telemetry(pool.clone(), deployment, telemetry); - match input.write_intent { + let classification = classify_reserved_document(&input.workspace_id, &input.doc_id); + if authorize_reserved_document(&input.actor_user_id, classification) == ReservedDocumentAccessDecision::Denied { + return Err(napi_error("domain_permission_denied")); + } + let reserved = input.doc_id == permission_doc_id && classification.is_valid_reserved(); + let write_intent = if reserved { + WorkspaceDocWriteIntentV1::UpdateDoc + } else { + input.write_intent + }; + match write_intent { WorkspaceDocWriteIntentV1::UpdateDoc => { let command = DomainCommand::UpdateDoc { doc_id: permission_doc_id.to_string(), @@ -134,7 +146,7 @@ async fn append_authorized_updates( .fetch_one(&mut *transaction) .await .map_err(|error| napi_error(format!("load workspace document source: {error}")))?; - if !source_exists { + if !source_exists && !reserved { return Err(napi_error("doc_not_found")); } } @@ -330,7 +342,7 @@ mod tests { .bind(&workspace_id) .execute(&pool) .await?; - sqlx::query("INSERT INTO workspace_members(workspace_id,user_id,role,state) VALUES($1,$2,'member','active')") + sqlx::query("INSERT INTO workspace_members(workspace_id,user_id,role,state) VALUES($1,$2,'owner','active')") .bind(&workspace_id) .bind(&user_id) .execute(&pool) @@ -542,6 +554,26 @@ mod tests { delete.commit().await?; assert!(write.await?.is_err(), "a write must not recreate a deleted document"); + for (reserved_doc_id, allowed) in [ + (format!("db${workspace_id}$docProperties"), true), + (format!("userdata${user_id}${workspace_id}$settings"), true), + (format!("userdata$another-user${workspace_id}$settings"), false), + (format!("db${workspace_id}$unknown"), false), + ] { + let result = runtime + .append_workspace_doc_updates_v1(AppendWorkspaceDocUpdatesInputV1 { + workspace_id: workspace_id.clone(), + doc_id: reserved_doc_id.clone(), + updates: vec![Buffer::from(vec![0, 0])], + actor_user_id: user_id.clone(), + write_intent: WorkspaceDocWriteIntentV1::CreateDoc, + permission_doc_id: None, + expected_permission_generation: None, + }) + .await; + assert_eq!(result.is_ok(), allowed, "{reserved_doc_id}: {result:?}"); + } + let creating_doc_id = format!("doc-writer-creating-{suffix}"); let root = affine_doc_loader::add_doc_to_root_doc(vec![0, 0], &creating_doc_id, None)?; sqlx::query("INSERT INTO snapshots(workspace_id,guid,blob,size,updated_at) VALUES($1,$1,$2,$3,now())") diff --git a/packages/backend/native/src/runtime/backend_runtime/domain_command/lifecycle.rs b/packages/backend/native/src/runtime/backend_runtime/domain_command/lifecycle.rs index fccbc27ace..b0e5440312 100644 --- a/packages/backend/native/src/runtime/backend_runtime/domain_command/lifecycle.rs +++ b/packages/backend/native/src/runtime/backend_runtime/domain_command/lifecycle.rs @@ -136,8 +136,7 @@ pub(super) async fn append_root_update( .bind(&workspace_id) .fetch_optional(&mut **transaction) .await - .map_err(|error| RuntimeError::database("load root snapshot for append", error))? - .ok_or_else(|| RuntimeError::invalid_input("workspace_root_not_found"))?; + .map_err(|error| RuntimeError::database("load root snapshot for append", error))?; let updates = sqlx::query_scalar::<_, Vec>( "SELECT blob FROM updates WHERE workspace_id=$1 AND guid=$1 ORDER BY created_at FOR SHARE", ) @@ -148,16 +147,32 @@ pub(super) async fn append_root_update( let update = BASE64 .decode(encoded_update) .map_err(|error| RuntimeError::invalid_input(format!("invalid root update: {error}")))?; - assert_no_lifecycle_change(snapshot, updates, &update)?; + let initialize = snapshot.is_none(); + let merged = validate_root_update(snapshot.unwrap_or_else(|| vec![0, 0]), updates, &update)?; let timestamp = next_workspace_doc_update_timestamp(transaction, &workspace_id, &workspace_id).await?; - sqlx::query("INSERT INTO updates (workspace_id,guid,blob,created_at,created_by) VALUES($1,$1,$2,$3,$4)") + if initialize { + sqlx::query( + "INSERT INTO snapshots (workspace_id,guid,blob,size,updated_at,created_by,updated_by) \ + VALUES($1,$1,$2,$3,$4,$5,$5)", + ) .bind(&workspace_id) - .bind(&update) + .bind(&merged) + .bind(merged.len() as i64) .bind(timestamp) .bind(&actor_user_id) .execute(&mut **transaction) .await - .map_err(|error| RuntimeError::database("append canonical root update", error))?; + .map_err(|error| RuntimeError::database("initialize canonical root snapshot", error))?; + } else { + sqlx::query("INSERT INTO updates (workspace_id,guid,blob,created_at,created_by) VALUES($1,$1,$2,$3,$4)") + .bind(&workspace_id) + .bind(&update) + .bind(timestamp) + .bind(&actor_user_id) + .execute(&mut **transaction) + .await + .map_err(|error| RuntimeError::database("append canonical root update", error))?; + } invalidate_doc_blob_projection(transaction, &workspace_id, &workspace_id, embedding_schema_ready).await?; Ok(json!({ "timestamp": timestamp })) } @@ -198,7 +213,7 @@ pub(in crate::runtime::backend_runtime) async fn workspace_root_contains_active_ Ok(project_complete_root(binary, false, "before document creation")?.contains(doc_id)) } -fn assert_no_lifecycle_change(snapshot: Vec, updates: Vec>, incoming: &[u8]) -> RuntimeResult<()> { +fn validate_root_update(snapshot: Vec, updates: Vec>, incoming: &[u8]) -> RuntimeResult> { let mut root = Doc::default(); root .apply_update_from_binary_v1(&snapshot) @@ -220,7 +235,7 @@ fn assert_no_lifecycle_change(snapshot: Vec, updates: Vec>, incoming .encode_update_v1() .map_err(|error| RuntimeError::invalid_state(format!("encode root after append failed: {error}")))?; let new_all = project_complete_root(after.clone(), true, "after append")?; - let new_active = project_complete_root(after, false, "after append")?; + let new_active = project_complete_root(after.clone(), false, "after append")?; let deletes = old_all.iter().any(|id| !new_all.contains(id)); let trashes = old_active.iter().any(|id| !new_active.contains(id)); let restores = new_active @@ -229,7 +244,7 @@ fn assert_no_lifecycle_change(snapshot: Vec, updates: Vec>, incoming if deletes || trashes || restores { return Err(RuntimeError::invalid_input("doc_lifecycle_requires_command")); } - Ok(()) + Ok(after) } fn project_complete_root( @@ -237,6 +252,9 @@ fn project_complete_root( include_trash: bool, operation: &str, ) -> RuntimeResult> { + if binary == [0, 0] { + return Ok(Default::default()); + } let projection = affine_doc_loader::project_workspace_root(binary, include_trash) .map_err(|error| RuntimeError::invalid_state(format!("project root {operation} failed: {error}")))?; if !projection.complete { @@ -389,24 +407,25 @@ mod tests { fn ordinary_root_updates_cannot_encode_lifecycle_effects() { let snapshot = affine_doc_loader::add_doc_to_root_doc(vec![0, 0], "a", None).unwrap(); let trash = mutate_root(snapshot.clone(), Vec::new(), "a", DocLifecycle::Trash).unwrap(); - assert!(assert_no_lifecycle_change(snapshot.clone(), Vec::new(), &trash).is_err()); + assert!(validate_root_update(snapshot.clone(), Vec::new(), &trash).is_err()); let restore = mutate_root(snapshot.clone(), vec![trash.clone()], "a", DocLifecycle::Restore).unwrap(); - assert!(assert_no_lifecycle_change(snapshot.clone(), vec![trash], &restore).is_err()); + assert!(validate_root_update(snapshot.clone(), vec![trash], &restore).is_err()); let delete = mutate_root(snapshot.clone(), Vec::new(), "a", DocLifecycle::Delete).unwrap(); - assert!(assert_no_lifecycle_change(snapshot.clone(), Vec::new(), &delete).is_err()); + assert!(validate_root_update(snapshot.clone(), Vec::new(), &delete).is_err()); let add = affine_doc_loader::add_doc_to_root_doc(snapshot.clone(), "b", None).unwrap(); - assert!(assert_no_lifecycle_change(snapshot, Vec::new(), &add).is_ok()); + assert!(validate_root_update(snapshot, Vec::new(), &add).is_ok()); } #[test] fn partial_workspace_root_is_rejected_before_semantic_comparison() { let snapshot = affine_doc_loader::add_doc_to_root_doc(vec![0, 0], "a", None).unwrap(); let dependent_delta = mutate_root(snapshot.clone(), Vec::new(), "a", DocLifecycle::Trash).unwrap(); + assert!(validate_root_update(vec![0, 0], Vec::new(), &dependent_delta).is_err()); assert!( - assert_no_lifecycle_change(dependent_delta, Vec::new(), &snapshot).is_err(), + validate_root_update(dependent_delta, Vec::new(), &snapshot).is_err(), "a root update with missing client-clock predecessors must fail closed" ); } @@ -420,15 +439,20 @@ mod tests { let suffix = uuid::Uuid::new_v4().simple().to_string(); let doc_id = format!("domain-lifecycle-{suffix}"); let root = affine_doc_loader::add_doc_to_root_doc(vec![0, 0], &doc_id, None).unwrap(); - sqlx::query( - "INSERT INTO snapshots(workspace_id,guid,blob,updated_at,created_by,updated_by) VALUES($1,$1,$2,now(),$3,$3)", + let authorizer = PermissionAuthorizer::new(pool.clone(), Deployment::Cloud); + let mut transaction = pool.begin().await.unwrap(); + append_root_update( + &authorizer, + &mut transaction, + actor_user_id.clone(), + workspace_id.clone(), + BASE64.encode(root), + None, + true, ) - .bind(&workspace_id) - .bind(root) - .bind(&actor_user_id) - .execute(&pool) .await .unwrap(); + transaction.commit().await.unwrap(); for index in 0..3 { let user_id = format!("domain-lifecycle-overflow-{index}-{suffix}"); diff --git a/packages/backend/server/package.json b/packages/backend/server/package.json index f041c2188e..f56dc43b54 100644 --- a/packages/backend/server/package.json +++ b/packages/backend/server/package.json @@ -1,7 +1,7 @@ { "name": "@affine/server", "private": true, - "version": "0.27.0", + "version": "0.27.5", "description": "Affine Node.js server", "type": "module", "scripts": { diff --git a/packages/backend/server/src/__tests__/copilot/capability-runtime.spec.ts b/packages/backend/server/src/__tests__/copilot/capability-runtime.spec.ts index b9b4b1a47d..4d1ea2b383 100644 --- a/packages/backend/server/src/__tests__/copilot/capability-runtime.spec.ts +++ b/packages/backend/server/src/__tests__/copilot/capability-runtime.spec.ts @@ -1,15 +1,22 @@ +import { Readable } from 'node:stream'; + import ava from 'ava'; +import Sinon from 'sinon'; import { z } from 'zod'; import { Config, CopilotQuotaExceeded } from '../../base'; import type { BackendRuntimeProvider } from '../../core/backend-runtime'; +import { StorageRuntimeProvider } from '../../core/storage-runtime'; import type { Models } from '../../models'; import type { ByokEntitlementPolicy } from '../../plugins/copilot/byok'; import type { ConversationPolicy } from '../../plugins/copilot/conversation/policy'; import { CapabilityRuntime } from '../../plugins/copilot/runtime/capability-runtime'; import { CopilotRuntimeEventConsumer } from '../../plugins/copilot/runtime/copilot-runtime-event-consumer'; +import { AttachmentAdmissionHost } from '../../plugins/copilot/runtime/hosts/attachment-admission'; +import { AttachmentMaterializer } from '../../plugins/copilot/runtime/hosts/attachment-materializer'; import { executeToolCall } from '../../plugins/copilot/runtime/tool/bridge'; import type { ToolRuntime } from '../../plugins/copilot/runtime/tool-runtime'; +import { CopilotStorage } from '../../plugins/copilot/storage'; const test = ava; @@ -36,6 +43,14 @@ function runtimeFixture(streamError?: string, enabled = true) { return { events: [], result: { embeddings: [[1, 2]] } }; if (input.slot === 'search.rerank') return { events: [], result: { scores: [0.9] } }; + if (input.slot === 'prompt.structured') + return { + events: [], + result: { + output_json: { text: 'hello' }, + output_text: '{"text":"hello"}', + }, + }; if ( input.slot === 'image.generate' || input.slot === 'action.image.filter.sketch' @@ -85,26 +100,61 @@ function runtimeFixture(streamError?: string, enabled = true) { consume: async () => {}, } as unknown as CopilotRuntimeEventConsumer; const config = { copilot: { enabled } } as Config; + const storageRuntime = Sinon.createStubInstance(StorageRuntimeProvider); + storageRuntime.getObject.callsFake(async () => ({ + body: Readable.from(Buffer.from('image')), + metadata: { + contentType: 'image/png', + contentLength: 5, + lastModified: new Date(0), + }, + })); + const storage = new CopilotStorage(storageRuntime); + const materializer = Sinon.createStubInstance(AttachmentMaterializer); + materializer.fetchRemoteAttachment.resolves({ + data: 'aW1hZ2U=', + mimeType: 'image/png', + }); return { calls, + storageRuntime, + storage, + materializer, runtime: new CapabilityRuntime( backend, entitlement, conversation, tools, consumer, - config + config, + new AttachmentAdmissionHost(materializer, storage) ), }; } test('disabled copilot rejects native execution before route access', async t => { - const { runtime, calls } = runtimeFixture(undefined, false); + const { runtime, calls, materializer } = runtimeFixture(undefined, false); t.false(await runtime.embeddingConfigured('ignored')); await t.throwsAsync(runtime.embed('ignored', ['text']), { message: 'Copilot is disabled.', }); + await t.throwsAsync( + async () => + await collect( + runtime.streamText({}, [ + { + role: 'user', + content: 'hello', + attachments: ['https://example.com/image.png'], + }, + ]) + ), + { + message: 'Copilot is disabled.', + } + ); + t.false(materializer.fetchRemoteAttachment.called); t.deepEqual(calls, []); }); @@ -136,8 +186,9 @@ test('all operation kinds enter the native slot pipeline', async t => { ); }); -test('image request builder receives only serializable request options', async t => { - const { runtime, calls } = runtimeFixture(); +test('image request builder receives serializable options and materialized attachments', async t => { + const { runtime, calls, storage, storageRuntime, materializer } = + runtimeFixture(); const controller = new AbortController(); await collect( @@ -168,10 +219,68 @@ test('image request builder receives only serializable request options', async t }, }, }); + + const locator = storage.sessionAttachmentUrl( + 'session-1', + 'workspace-1', + 'image' + ); + for (const attachment of [ + locator, + { attachment: locator, mimeType: 'image/png' }, + { kind: 'url' as const, url: locator }, + 'https://example.com/input.png', + ]) { + await collect( + runtime.streamImageArtifacts( + {}, + [{ role: 'user', content: 'edit', attachments: [attachment] }], + { + user: 'user-1', + workspace: 'workspace-1', + session: 'session-1', + } + ) + ); + t.like(calls.at(-1)?.request, { + operation: 'edit', + images: [ + { + kind: 'bytes', + data: [...Buffer.from('image')], + mediaType: 'image/png', + }, + ], + }); + } + t.is(storageRuntime.getObject.callCount, 3); + t.true( + storageRuntime.getObject.alwaysCalledWithExactly( + 'copilot', + 'user-1/workspace-1/image' + ) + ); + t.true(materializer.fetchRemoteAttachment.calledOnce); + await t.throwsAsync( + async () => + await collect( + runtime.streamImageArtifacts( + {}, + [{ role: 'user', content: 'edit', attachments: [locator] }], + { + user: 'user-1', + workspace: 'workspace-2', + session: 'session-1', + } + ) + ), + { message: 'Copilot attachment scope mismatch' } + ); + t.is(calls.length, 5); }); -test('text streaming consumes native generic events', async t => { - const { runtime, calls } = runtimeFixture(); +test('chat and structured requests materialize attachments and consume native results', async t => { + const { runtime, calls, storage } = runtimeFixture(); const chunks = await collect( runtime.streamText({ profileId: 'profile-1', modelId: 'vendor/model:B' }, [ { role: 'user', content: 'hello' }, @@ -183,6 +292,48 @@ test('text streaming consumes native generic events', async t => { profileId: 'profile-1', modelId: 'vendor/model:B', }); + const messages = [ + { + role: 'user' as const, + content: 'hello', + attachments: [ + storage.sessionAttachmentUrl('session-1', 'workspace-1', 'image'), + ], + }, + ]; + const options = { + user: 'user-1', + workspace: 'workspace-1', + session: 'session-1', + }; + await collect(runtime.streamText({}, messages, options)); + await collect(runtime.streamObject({}, messages, options)); + await runtime.generateStructured({}, messages, options, undefined, { + responseSchemaJson: { + type: 'object', + properties: { text: { type: 'string' } }, + required: ['text'], + }, + schemaHash: 'test', + }); + for (const call of calls.slice(1)) { + t.like(call.request, { + messages: [ + { + role: 'user', + content: [ + { type: 'text', text: 'hello' }, + { + type: 'image', + source: { media_type: 'image/png', data: 'aW1hZ2U=' }, + }, + ], + }, + ], + }); + t.false(JSON.stringify(call.request).includes('/api/copilot/')); + } + t.true(messages[0].attachments[0].startsWith('/api/copilot/')); await t.throwsAsync(runtime.assertRoute('chat.default', {}, {}), { instanceOf: CopilotQuotaExceeded, }); diff --git a/packages/backend/server/src/__tests__/copilot/runtime-boundaries.spec.ts b/packages/backend/server/src/__tests__/copilot/runtime-boundaries.spec.ts index 59d0f513a7..f7565f7dbf 100644 --- a/packages/backend/server/src/__tests__/copilot/runtime-boundaries.spec.ts +++ b/packages/backend/server/src/__tests__/copilot/runtime-boundaries.spec.ts @@ -41,6 +41,7 @@ import { } from '../../plugins/copilot/feature'; import type { PromptService } from '../../plugins/copilot/prompt'; import type { ResolvedPrompt } from '../../plugins/copilot/prompt/spec'; +import { ChatMessageAttachment } from '../../plugins/copilot/providers/types'; import { TextStreamParser } from '../../plugins/copilot/providers/utils'; import { ArtifactRetrievalService } from '../../plugins/copilot/retrieval/artifact'; import { DocumentRetrievalService } from '../../plugins/copilot/retrieval/document'; @@ -586,11 +587,26 @@ test('document tools enforce the user-selected hard scope', async t => { }> ) => candidates, }; + const readDocIds: string[] = []; + const docReader = { + getDocMarkdown: async (_workspaceId: string, docId: string) => { + readDocIds.push(docId); + if (docId === 'missing-doc') return null; + return { + title: docId, + markdown: docId.startsWith('long-doc') + ? 'a'.repeat(25_000) + : `${docId} content`, + revision: '1', + }; + }, + } as unknown as DocReader; const hybrid = new DocumentRetrievalService( readableAc, lexicalIndexer, vectorSearch, - documentModels + documentModels, + docReader ); const hybridResult = await hybrid.search(options, 'query', undefined, 10); t.is(hybridResult.retrievalMode, 'hybrid'); @@ -599,12 +615,21 @@ test('document tools enforce the user-selected hard scope', async t => { ['shared-doc'] ); t.true(hybridResult.hits[0].score > 1 / 61); + const healthyScoped = await hybrid.search( + options, + 'query', + ['shared-doc'], + 10 + ); + t.is(healthyScoped.retrievalMode, 'hybrid'); + t.deepEqual(readDocIds, []); const lexicalOnly = new DocumentRetrievalService( readableAc, lexicalIndexer, { ...vectorSearch, canEmbedding: false }, - documentModels + documentModels, + docReader ); const lexicalResult = await lexicalOnly.search( options, @@ -623,7 +648,8 @@ test('document tools enforce the user-selected hard scope', async t => { }, } as unknown as IndexerService, vectorSearch, - documentModels + documentModels, + docReader ); const vectorResult = await vectorOnly.search(options, 'query', undefined, 10); t.is(vectorResult.retrievalMode, 'vector'); @@ -632,6 +658,65 @@ test('document tools enforce the user-selected hard scope', async t => { vectorResult.hits.map(result => result.docId), ['shared-doc'] ); + t.deepEqual(readDocIds, []); + const unavailable = new DocumentRetrievalService( + readableAc, + { + searchDocsByKeyword: async () => { + throw new SearchProviderUnavailable(); + }, + } as unknown as IndexerService, + { + ...vectorSearch, + matchWorkspaceDocCandidates: async () => { + throw new Error('embedding_unavailable'); + }, + }, + documentModels, + docReader + ); + await t.throwsAsync(unavailable.search(options, 'query', undefined, 10), { + message: 'SEARCH_UNAVAILABLE', + }); + const scoped = await unavailable.search( + options, + 'query', + ['cat-doc', 'hidden-doc', 'dog-doc', 'cat-doc'], + 10 + ); + t.like(scoped, { + retrievalMode: 'scoped', + degradedReason: 'SEARCH_UNAVAILABLE', + }); + t.deepEqual(readDocIds, ['cat-doc', 'dog-doc']); + t.deepEqual( + scoped.hits.map(hit => [hit.docId, hit.excerpt]), + [ + ['cat-doc', 'cat-doc content'], + ['dog-doc', 'dog-doc content'], + ] + ); + readDocIds.length = 0; + await unavailable.search(options, 'query', ['cat-doc', 'dog-doc'], 1); + t.deepEqual(readDocIds, ['cat-doc']); + const bounded = await unavailable.search(options, 'query', ['long-doc'], 1); + t.is(bounded.hits[0].excerpt.length, 20_000); + const boundedMultiple = await unavailable.search( + options, + 'query', + ['long-doc-1', 'long-doc-2'], + 2 + ); + t.deepEqual( + boundedMultiple.hits.map(hit => hit.excerpt.length), + [10_000, 10_000] + ); + await t.throwsAsync( + unavailable.search(options, 'query', ['missing-doc'], 1), + { + message: 'SEARCH_UNAVAILABLE', + } + ); // model omits doc_ids: pinned scope applies let search = buildDocumentSearch(retrieval, options, { @@ -1632,6 +1717,16 @@ test.serial('copilot attachments require canonical session scope', async t => { 'notes.txt', { rawBody: attachmentBody } as never ); + for (const attachment of [ + uploaded.url, + { attachment: uploaded.url, mimeType: 'text/plain' }, + { kind: 'url', url: uploaded.url, mimeType: 'text/plain' }, + ]) { + t.true(ChatMessageAttachment.safeParse(attachment).success); + } + for (const url of ['/private/file.txt', '//example.com/file.txt']) { + t.false(ChatMessageAttachment.safeParse(url).success); + } const admitted = await new AttachmentAdmissionHost( { fetchRemoteAttachment: async () => @@ -1697,6 +1792,17 @@ test.serial('copilot attachments require canonical session scope', async t => { sessionId: 'session-2', }) ); + await t.throwsAsync( + new AttachmentAdmissionHost( + {} as never, + attachmentStorage + ).admitPromptAttachment(uploaded.url, { + userId: 'user-1', + workspaceId: 'workspace-2', + sessionId: 'session-1', + }), + { message: 'Copilot attachment scope mismatch' } + ); t.snapshot({ uploaded, diff --git a/packages/backend/server/src/__tests__/doc/workspace.spec.ts b/packages/backend/server/src/__tests__/doc/workspace.spec.ts index 0848e3595b..2ebc873ade 100644 --- a/packages/backend/server/src/__tests__/doc/workspace.spec.ts +++ b/packages/backend/server/src/__tests__/doc/workspace.spec.ts @@ -3,6 +3,7 @@ import test from 'ava'; import * as Sinon from 'sinon'; import { applyUpdate, Doc as YDoc, encodeStateAsUpdate } from 'yjs'; +import { EventBus } from '../../base'; import { BackendRuntimeProvider } from '../../core/backend-runtime'; import { DocStorageModule, @@ -75,8 +76,16 @@ test('should not compact from a stale update view', async t => { t.not(await db.update.count(), 0); }); -test('should retry if failed to insert updates', async t => { +test('should finish doc creation after retrying failed updates', async t => { const stub = Sinon.stub(runtime, 'appendWorkspaceDocUpdatesTrustedV1'); + t.teardown(() => stub.restore()); + let creationCompleted = false; + t.teardown( + m.get(EventBus).on('doc.created', async () => { + await new Promise(resolve => setImmediate(resolve)); + creationCompleted = true; + }) + ); stub.onCall(0).rejects(new Error()); stub.onCall(1).resolves(Date.now()); @@ -85,8 +94,7 @@ test('should retry if failed to insert updates', async t => { adapter.pushDocUpdatesTrusted('1', '1', [Buffer.from([0, 0])]) ); t.is(stub.callCount, 2); - - stub.restore(); + t.true(creationCompleted); }); test('should throw if meet max retry times', async t => { diff --git a/packages/backend/server/src/__tests__/event/eventbus.spec.ts b/packages/backend/server/src/__tests__/event/eventbus.spec.ts index 4bf3b41b60..b3a0f6580d 100644 --- a/packages/backend/server/src/__tests__/event/eventbus.spec.ts +++ b/packages/backend/server/src/__tests__/event/eventbus.spec.ts @@ -47,23 +47,27 @@ test('should dispatch event listener', t => { off(); }); -test('should dispatch async event listener', async t => { - const { eventbus, listeners } = t.context; +for (const method of ['emitAsync', 'emitDetachedAsync'] as const) { + test(`should await event listeners with ${method}`, async t => { + const { eventbus, listeners } = t.context; - const runtimeListener = Sinon.stub().returnsArg(0); - const off = eventbus.on('__test__.event', runtimeListener); + const runtimeListener = Sinon.stub().callsFake(async payload => { + await new Promise(resolve => setImmediate(resolve)); + return payload; + }); + const off = eventbus.on('__test__.event', runtimeListener); + t.teardown(off); - const payload = { count: 0 }; - const returns = await eventbus.emitAsync('__test__.event', payload); + const payload = { count: 0 }; + const returns = await eventbus[method]('__test__.event', payload); - t.true(listeners.onTestEvent.calledOnceWithExactly(payload)); - t.true(listeners.onTestEventAndEvent2.calledOnceWithExactly(payload)); - t.true(runtimeListener.calledOnceWithExactly(payload)); + t.true(listeners.onTestEvent.calledOnceWithExactly(payload)); + t.true(listeners.onTestEventAndEvent2.calledOnceWithExactly(payload)); + t.true(runtimeListener.calledOnceWithExactly(payload)); - t.deepEqual(returns, [payload, payload, payload]); - - off(); -}); + t.deepEqual(returns, [payload, payload, payload]); + }); +} test('should dispatch multiple event handlers with same name', async t => { const { eventbus, listeners } = t.context; diff --git a/packages/backend/server/src/__tests__/mocks/eventbus.mock.ts b/packages/backend/server/src/__tests__/mocks/eventbus.mock.ts index 94332699df..09d55e11a2 100644 --- a/packages/backend/server/src/__tests__/mocks/eventbus.mock.ts +++ b/packages/backend/server/src/__tests__/mocks/eventbus.mock.ts @@ -9,6 +9,7 @@ export class MockEventBus { emit: Sinon.SinonStub = this.stub.emitAsync; emitAsync: Sinon.SinonStub = this.stub.emitAsync; emitDetached: Sinon.SinonStub = this.stub.emitAsync; + emitDetachedAsync: Sinon.SinonStub = this.stub.emitAsync; broadcast: Sinon.SinonStub = this.stub.broadcast; last( diff --git a/packages/backend/server/src/__tests__/sync/gateway.spec.ts b/packages/backend/server/src/__tests__/sync/gateway.spec.ts index 5617740588..e425c72c5b 100644 --- a/packages/backend/server/src/__tests__/sync/gateway.spec.ts +++ b/packages/backend/server/src/__tests__/sync/gateway.spec.ts @@ -1,3 +1,6 @@ +import { readFileSync } from 'node:fs'; +import { resolve } from 'node:path'; + import { PrismaClient } from '@prisma/client'; import test, { type ExecutionContext } from 'ava'; import Sinon from 'sinon'; @@ -606,31 +609,42 @@ test('space:join-batch should validate entries before joining', async t => { } }); -test('space:join-batch should reject clients before 0.27.5', async t => { +test('space:join-batch rejects old clients and accepts the current web build', async t => { const { user, cookieHeader } = await login(app); - const socket = createClient(url, cookieHeader); + const webPackage = JSON.parse( + readFileSync( + resolve(process.cwd(), '../../frontend/apps/web/package.json'), + 'utf8' + ) + ); - try { - await waitForConnect(socket); - const result = unwrapResponse( - t, - await emitWithAck<{ clientId: string; success: boolean }>( - socket, - 'space:join-batch', - { - spaces: [{ spaceType: 'userspace', spaceId: user.id }], - clientVersion: '0.27.4', - } - ) - ); - t.false(result.success); - await waitForDisconnect(socket); - } finally { - socket.disconnect(); + for (const [clientVersion, accepted] of [ + ['0.27.4', false], + [webPackage.version, true], + ] as const) { + const socket = createClient(url, cookieHeader); + try { + await waitForConnect(socket); + const result = unwrapResponse( + t, + await emitWithAck<{ clientId: string; success: boolean }>( + socket, + 'space:join-batch', + { + spaces: [{ spaceType: 'userspace', spaceId: user.id }], + clientVersion, + } + ) + ); + t.is(result.success, accepted, clientVersion); + if (!accepted) await waitForDisconnect(socket); + } finally { + socket.disconnect(); + } } }); -test('space:join-batch should authorize once and join all requested rooms', async t => { +test('space:join-batch joins rooms and initializes workspace documents', async t => { const models = app.get(Models); const { user: owner, cookieHeader: ownerCookieHeader } = await login(app); const { cookieHeader: deniedCookieHeader } = await login(app); @@ -652,6 +666,11 @@ test('space:join-batch should authorize once and join all requested rooms', asyn { spaceType: 'workspace', spaceId: workspace.id }, { spaceType: 'workspace', spaceId: workspace.id, docId: 'doc-a' }, { spaceType: 'workspace', spaceId: workspace.id, docId: 'doc-b' }, + { + spaceType: 'workspace', + spaceId: workspace.id, + docId: `db$${workspace.id}$docProperties`, + }, ], clientVersion: '0.27.5', }; @@ -763,6 +782,54 @@ test('space:join-batch should authorize once and join all requested rooms', asyn new Set(['doc-a', 'doc-b']) ); await noDeniedEvent; + unwrapResponse( + t, + await emitWithAck(ownerSocket, 'space:join-batch', { + spaces: [ + { + spaceType: 'workspace', + spaceId: workspace.id, + docId: workspace.id, + }, + ], + clientVersion: '0.27.5', + }) + ); + const root = addDocToRootDoc(Buffer.from([0, 0]), 'doc-a'); + unwrapResponse( + t, + await emitWithAck(ownerSocket, 'space:push-doc-update', { + spaceType: 'workspace', + spaceId: workspace.id, + docId: workspace.id, + update: Buffer.from(root).toString('base64'), + }) + ); + for (const docId of [ + 'doc-a', + 'doc-a', + `db$${workspace.id}$docProperties`, + ]) { + await app.get(PrismaClient).$executeRaw` + UPDATE workspace_sync_permission_generations + SET generation = generation + 1 + WHERE workspace_id = ${workspace.id} + `; + unwrapResponse( + t, + await emitWithAck(ownerSocket, 'space:join-batch', batch) + ); + unwrapResponse( + t, + await emitWithAck(ownerSocket, 'space:push-doc-update', { + spaceType: 'workspace', + spaceId: workspace.id, + docId, + update: createYjsUpdateBase64(), + }) + ); + } + t.true(await models.doc.exists(workspace.id, 'doc-a')); } finally { ownerSocket.disconnect(); receiverSocket.disconnect(); diff --git a/packages/backend/server/src/base/event/eventbus.ts b/packages/backend/server/src/base/event/eventbus.ts index cb90ba3ad5..5534df7435 100644 --- a/packages/backend/server/src/base/event/eventbus.ts +++ b/packages/backend/server/src/base/event/eventbus.ts @@ -108,6 +108,17 @@ export class EventBus return true; } + /** + * Await listeners without inheriting the current transaction. + */ + async emitDetachedAsync(event: T, payload: Events[T]) { + const requestId = this.cls.getId(); + return await this.cls.run({ ifNested: 'override' }, async () => { + this.cls.set(CLS_ID, requestId ?? genRequestId('event')); + return await this.emitAsync(event, payload); + }); + } + /** * Broadcast event to trigger all listeners on all instance in cluster */ diff --git a/packages/backend/server/src/core/doc/adapters/workspace.ts b/packages/backend/server/src/core/doc/adapters/workspace.ts index a5405a9634..e12142bc38 100644 --- a/packages/backend/server/src/core/doc/adapters/workspace.ts +++ b/packages/backend/server/src/core/doc/adapters/workspace.ts @@ -167,7 +167,7 @@ export class PgWorkspaceDocStorageAdapter extends DocStorageAdapter { }); if (isNewDoc) { - this.event.emitDetached('doc.created', { + await this.event.emitDetachedAsync('doc.created', { workspaceId, docId, editor: editorId, diff --git a/packages/backend/server/src/core/realtime/__tests__/registry.spec.ts b/packages/backend/server/src/core/realtime/__tests__/registry.spec.ts index 1e1dcb799d..e7fef70238 100644 --- a/packages/backend/server/src/core/realtime/__tests__/registry.spec.ts +++ b/packages/backend/server/src/core/realtime/__tests__/registry.spec.ts @@ -651,7 +651,7 @@ test('doc realtime providers register share state and grants handlers', async t } as unknown as PermissionAccess; const models = { doc: { - getDocInfo: async () => ({ + getMeta: async () => ({ public: true, mode: PublicDocMode.Page, defaultRole: DocRole.Reader, diff --git a/packages/backend/server/src/core/sync/gateway.ts b/packages/backend/server/src/core/sync/gateway.ts index 984d2f1352..7efd892ddd 100644 --- a/packages/backend/server/src/core/sync/gateway.ts +++ b/packages/backend/server/src/core/sync/gateway.ts @@ -1210,7 +1210,7 @@ export class SpaceSyncGateway }); } } - for (const space of subscriptionsToAdd) { + for (const space of docSpaces) { this.addActiveDocSubscription( client, space.spaceType, @@ -1638,7 +1638,8 @@ abstract class SyncSocketAdapter { docId: string, updates: Buffer[], editorId: string, - expectedPermissionGeneration?: number + expectedPermissionGeneration?: number, + writeIntent: 'update_doc' | 'create_doc' = 'update_doc' ) { this.assertIn(spaceId); return await this.storage.pushDocUpdates( @@ -1646,7 +1647,8 @@ abstract class SyncSocketAdapter { docId, updates, editorId, - expectedPermissionGeneration + expectedPermissionGeneration, + writeIntent ); } @@ -1697,7 +1699,10 @@ class WorkspaceSyncAdapter extends SyncSocketAdapter { docId, updates, editorId, - expectedPermissionGeneration + expectedPermissionGeneration, + (await this.models.doc.exists(spaceId, docId)) + ? 'update_doc' + : 'create_doc' ); } diff --git a/packages/backend/server/src/core/workspaces/doc-realtime.ts b/packages/backend/server/src/core/workspaces/doc-realtime.ts index dd21b7beaa..11d07e917d 100644 --- a/packages/backend/server/src/core/workspaces/doc-realtime.ts +++ b/packages/backend/server/src/core/workspaces/doc-realtime.ts @@ -79,10 +79,8 @@ export class DocShareRealtimeProvider implements OnModuleInit { docId: string ): Promise { await this.assertRead(userId, workspaceId, docId); - const doc = await this.models.doc.getDocInfo(workspaceId, docId); - if (!doc) { - return null; - } + const doc = await this.models.doc.getMeta(workspaceId, docId); + if (!doc) return null; return { public: doc.public, mode: PublicDocMode[doc.mode], diff --git a/packages/backend/server/src/plugins/copilot/providers/types.ts b/packages/backend/server/src/plugins/copilot/providers/types.ts index c63713642f..932f8b1161 100644 --- a/packages/backend/server/src/plugins/copilot/providers/types.ts +++ b/packages/backend/server/src/plugins/copilot/providers/types.ts @@ -146,6 +146,10 @@ const AttachmentUrlSchema = z.string().refine(value => { return true; } + if (/^\/api\/copilot\/chat\/[^/?#]+\/attachments\/[^/?#]+\?/.test(value)) { + return true; + } + try { const url = new URL(value); return ( @@ -156,7 +160,7 @@ const AttachmentUrlSchema = z.string().refine(value => { } catch { return false; } -}, 'attachments must use https?://, gs:// or data: urls'); +}, 'attachments must use https?://, gs://, data: urls or Copilot session attachment locators'); export const PromptAttachmentSourceKindSchema = z.enum([ 'url', diff --git a/packages/backend/server/src/plugins/copilot/retrieval/document.ts b/packages/backend/server/src/plugins/copilot/retrieval/document.ts index 0120a893b7..39ca196d1e 100644 --- a/packages/backend/server/src/plugins/copilot/retrieval/document.ts +++ b/packages/backend/server/src/plugins/copilot/retrieval/document.ts @@ -1,6 +1,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { SearchProviderUnavailable } from '../../../base'; +import { DocReader } from '../../../core/doc'; import { PermissionAccess } from '../../../core/permission'; import type { DocVisibility } from '../../../core/utils/blocksuite'; import { type DocChunkSimilarity, Models } from '../../../models'; @@ -74,7 +75,8 @@ export class DocumentRetrievalService { private readonly indexer: IndexerService, @Inject(DOCUMENT_VECTOR_SEARCH) private readonly context: DocumentVectorSearch, - private readonly models: Models + private readonly models: Models, + private readonly docReader: DocReader ) {} async search( @@ -199,7 +201,38 @@ export class DocumentRetrievalService { ); }); if (lexicalResult === null && vector === null) { - throw new Error('SEARCH_UNAVAILABLE'); + if (!docIds?.length) throw new Error('SEARCH_UNAVAILABLE'); + const readable = await this.readable( + userId, + workspaceId, + [...new Set(docIds)].map(docId => ({ docId })) + ); + const documents = readable.slice(0, limit); + const maxChars = Math.floor(20_000 / Math.max(documents.length, 1)); + const hits: DocumentSearchHit[] = await Promise.all( + documents.map(async ({ docId }) => { + const content = await this.docReader.getDocMarkdown( + workspaceId, + docId, + true + ); + if (!content) throw new Error('SEARCH_UNAVAILABLE'); + return { + docId, + title: content.title, + excerpt: content.markdown.slice(0, maxChars), + visibility: 'page' as const, + score: 0, + unitId: `document:${docId}`, + }; + }) + ); + if (signal?.aborted) throw new Error('SEARCH_ABORTED'); + return { + retrievalMode: 'scoped', + degradedReason: 'SEARCH_UNAVAILABLE', + hits, + } as const; } const perDoc = new Map(); diff --git a/packages/backend/server/src/plugins/copilot/runtime/capability-runtime.ts b/packages/backend/server/src/plugins/copilot/runtime/capability-runtime.ts index 524d386212..7305648653 100644 --- a/packages/backend/server/src/plugins/copilot/runtime/capability-runtime.ts +++ b/packages/backend/server/src/plugins/copilot/runtime/capability-runtime.ts @@ -45,6 +45,7 @@ import { type CopilotRuntimeEvent, CopilotRuntimeEventConsumer, } from './copilot-runtime-event-consumer'; +import { AttachmentAdmissionHost } from './hosts/attachment-admission'; import { mapNativeSemanticError } from './native-errors'; import { buildCanonicalNativeRequest, @@ -80,9 +81,23 @@ export class CapabilityRuntime { private readonly conversations: ConversationPolicy, private readonly tools: ToolRuntime, private readonly events: CopilotRuntimeEventConsumer, - private readonly config: Config + private readonly config: Config, + private readonly attachments: AttachmentAdmissionHost ) {} + private async prepareMessages( + messages: PromptMessage[], + options: RuntimeOptions + ) { + assertCopilotEnabled(this.config); + return await this.attachments.preparePromptMessages(messages, { + userId: options.user ?? '', + workspaceId: options.workspace ?? '', + sessionId: options.session, + signal: options.signal, + }); + } + private async access(options: RuntimeOptions) { assertCopilotEnabled(this.config); const workspaceId = options.workspace; @@ -183,7 +198,7 @@ export class CapabilityRuntime { const toolSet = await this.tools.getTools(options, ''); const { request } = await buildCanonicalNativeRequest({ model: 'route-selected', - messages, + messages: await this.prepareMessages(messages, options), options, toolContracts: buildToolContracts(toolSet), attachmentCapability, @@ -306,7 +321,7 @@ export class CapabilityRuntime { } const { request } = await buildCanonicalNativeStructuredRequest({ model: 'route-selected', - messages, + messages: await this.prepareMessages(messages, options), options, responseContract: contract, attachmentCapability, @@ -408,7 +423,10 @@ export class CapabilityRuntime { slot, buildLlmImageRequestFromMessages({ model: 'route-selected', - messages: preparePromptMessagesForNativeRequest(messages, true), + messages: preparePromptMessagesForNativeRequest( + await this.prepareMessages(messages, options), + true + ), options: { quality, seed, modelName, loras }, }), cond, diff --git a/packages/backend/server/src/plugins/copilot/runtime/hosts/attachment-admission.ts b/packages/backend/server/src/plugins/copilot/runtime/hosts/attachment-admission.ts index fd93302c04..873ad37bb5 100644 --- a/packages/backend/server/src/plugins/copilot/runtime/hosts/attachment-admission.ts +++ b/packages/backend/server/src/plugins/copilot/runtime/hosts/attachment-admission.ts @@ -3,9 +3,11 @@ import { createHash } from 'node:crypto'; import { Injectable } from '@nestjs/common'; import { OneMB, readBuffer } from '../../../../base'; +import { applyPromptAttachmentMimeTypeHintForNative } from '../../providers/attachments'; import type { PromptAttachment, PromptAttachmentSourceKind, + PromptMessage, } from '../../providers/types'; import { promptAttachmentMimeType } from '../../providers/utils'; import { CopilotStorage } from '../../storage'; @@ -162,6 +164,41 @@ export class AttachmentAdmissionHost { private readonly storage: CopilotStorage ) {} + async preparePromptMessages( + messages: PromptMessage[], + context: AttachmentAdmissionContext + ): Promise { + context.signal?.throwIfAborted(); + return await Promise.all( + messages.map(async message => ({ + ...message, + attachments: message.attachments + ? await Promise.all( + message.attachments.map(async attachment => { + const source = parsePromptAttachment(attachment); + if ( + source.kind === 'file_handle' || + source.kind === 'data' || + source.kind === 'bytes' || + source.url?.startsWith('data:') + ) + return attachment; + return admittedAttachmentToPromptAttachment( + await this.admitPromptAttachment( + applyPromptAttachmentMimeTypeHintForNative( + attachment, + message + ), + context + ) + ); + }) + ) + : message.attachments, + })) + ); + } + async admitPromptAttachment( attachment: PromptAttachment, context: AttachmentAdmissionContext diff --git a/packages/common/auth/package.json b/packages/common/auth/package.json index 3678bea109..011a7ff028 100644 --- a/packages/common/auth/package.json +++ b/packages/common/auth/package.json @@ -2,7 +2,7 @@ "name": "@affine/auth", "private": true, "type": "module", - "version": "0.27.0", + "version": "0.27.5", "exports": { ".": "./src/index.ts" }, diff --git a/packages/common/debug/package.json b/packages/common/debug/package.json index c779da99b7..b049886b2d 100644 --- a/packages/common/debug/package.json +++ b/packages/common/debug/package.json @@ -12,5 +12,5 @@ "@types/debug": "^4.1.12", "vitest": "^4.1.8" }, - "version": "0.27.0" + "version": "0.27.5" } diff --git a/packages/common/env/package.json b/packages/common/env/package.json index e7beaea228..f8b0b3925d 100644 --- a/packages/common/env/package.json +++ b/packages/common/env/package.json @@ -21,5 +21,5 @@ "dependencies": { "zod": "^3.25.76" }, - "version": "0.27.0" + "version": "0.27.5" } diff --git a/packages/common/error/package.json b/packages/common/error/package.json index a7c211a044..7c4c45e10a 100644 --- a/packages/common/error/package.json +++ b/packages/common/error/package.json @@ -1,6 +1,6 @@ { "name": "@affine/error", - "version": "0.27.0", + "version": "0.27.5", "private": true, "type": "module", "exports": { diff --git a/packages/common/graphql/package.json b/packages/common/graphql/package.json index c646d7728c..279725f69e 100644 --- a/packages/common/graphql/package.json +++ b/packages/common/graphql/package.json @@ -1,6 +1,6 @@ { "name": "@affine/graphql", - "version": "0.27.0", + "version": "0.27.5", "description": "Autogenerated GraphQL client for affine.pro", "license": "MIT", "type": "module", diff --git a/packages/common/infra/package.json b/packages/common/infra/package.json index db413d307f..99529b6cd6 100644 --- a/packages/common/infra/package.json +++ b/packages/common/infra/package.json @@ -38,5 +38,5 @@ "electron": "*", "react-dom": "^19.0.0" }, - "version": "0.27.0" + "version": "0.27.5" } diff --git a/packages/common/infra/src/op/__tests__/client.spec.ts b/packages/common/infra/src/op/__tests__/client.spec.ts index f48dfaf6e5..b42362c6d0 100644 --- a/packages/common/infra/src/op/__tests__/client.spec.ts +++ b/packages/common/infra/src/op/__tests__/client.spec.ts @@ -86,15 +86,17 @@ describe('op client', () => { expect(data.byteLength).toBe(0); }); - it('should send optional payload call with abort signal', async ctx => { - const abortController = new AbortController(); - const result = ctx.producer.call( - 'init', - { fastText: true }, - abortController.signal - ); + it.for([true, false])( + 'should preserve payload with optional abort signal: %s', + async (withSignal, ctx) => { + const abortController = new AbortController(); + const result = ctx.producer.call( + 'init', + { fastText: true }, + withSignal ? abortController.signal : undefined + ); - expect(ctx.postMessage.mock.calls[0][0]).toMatchInlineSnapshot(` + expect(ctx.postMessage.mock.calls[0][0]).toMatchInlineSnapshot(` { "id": "init:1", "name": "init", @@ -105,14 +107,15 @@ describe('op client', () => { } `); - ctx.handlers.return({ - type: 'return', - id: 'init:1', - data: { ok: true }, - }); + ctx.handlers.return({ + type: 'return', + id: 'init:1', + data: { ok: true }, + }); - await expect(result).resolves.toEqual({ ok: true }); - }); + await expect(result).resolves.toEqual({ ok: true }); + } + ); it('should send undefined payload for optional input call', async ctx => { const result = ctx.producer.call('init', undefined); diff --git a/packages/common/infra/src/op/client.ts b/packages/common/infra/src/op/client.ts index e017fb8e58..e6c4def151 100644 --- a/packages/common/infra/src/op/client.ts +++ b/packages/common/infra/src/op/client.ts @@ -128,6 +128,9 @@ export class OpClient extends AutoMessageHandler { ...args: OpInputWithSignal ): CancelablePromise> { const promiseWithResolvers = Promise.withResolvers(); + if (args.length > 1 && args[args.length - 1] === undefined) { + args.pop(); + } const abortSignal = args[args.length - 1] instanceof AbortSignal ? (args.pop() as AbortSignal) diff --git a/packages/common/nbstore/package.json b/packages/common/nbstore/package.json index 618bdeb110..6427b2dcda 100644 --- a/packages/common/nbstore/package.json +++ b/packages/common/nbstore/package.json @@ -1,7 +1,7 @@ { "name": "@affine/nbstore", "type": "module", - "version": "0.27.0", + "version": "0.27.5", "private": true, "sideEffects": false, "exports": { diff --git a/packages/common/nbstore/src/__tests__/__snapshots__/cloud-doc-updates.spec.ts.snap b/packages/common/nbstore/src/__tests__/__snapshots__/cloud-doc-updates.spec.ts.snap new file mode 100644 index 0000000000..ef2ee27c51 --- /dev/null +++ b/packages/common/nbstore/src/__tests__/__snapshots__/cloud-doc-updates.spec.ts.snap @@ -0,0 +1,224 @@ +// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html + +exports[`CloudDocStorage broadcast updates > awareness joins active documents through the batch route 1`] = ` +[ + { + "event": "space:join-batch", + "payload": { + "clientVersion": "0.27.5", + "spaces": [ + { + "docId": "doc-a", + "spaceId": "space-1", + "spaceType": "workspace", + }, + { + "docId": "doc-b", + "spaceId": "space-1", + "spaceType": "workspace", + }, + ], + }, + }, + { + "event": "space:load-awarenesses", + "payload": { + "docId": "doc-a", + "spaceId": "space-1", + "spaceType": "workspace", + }, + }, + { + "event": "space:load-awarenesses", + "payload": { + "docId": "doc-b", + "spaceId": "space-1", + "spaceType": "workspace", + }, + }, +] +`; + +exports[`CloudDocStorage broadcast updates > batch route joins the workspace and applies lifecycle commands 1`] = ` +{ + "emitted": [ + { + "event": "space:join-batch", + "payload": { + "clientVersion": "0.27.5", + "spaces": [ + { + "docId": "space-1", + "spaceId": "space-1", + "spaceType": "workspace", + }, + ], + }, + }, + { + "event": "space:load-doc", + "payload": { + "docId": "space-1", + "spaceId": "space-1", + "spaceType": "workspace", + }, + }, + { + "event": "space:join-batch", + "payload": { + "clientVersion": "0.27.5", + "spaces": [ + { + "docId": "doc-1", + "spaceId": "space-1", + "spaceType": "workspace", + }, + ], + }, + }, + { + "event": "space:load-doc", + "payload": { + "docId": "doc-1", + "spaceId": "space-1", + "spaceType": "workspace", + }, + }, + { + "event": "space:join-batch", + "payload": { + "clientVersion": "0.27.5", + "spaces": [ + { + "docId": "doc-2", + "spaceId": "space-1", + "spaceType": "workspace", + }, + ], + }, + }, + { + "event": "space:load-doc", + "payload": { + "docId": "doc-2", + "spaceId": "space-1", + "spaceType": "workspace", + "stateVector": undefined, + }, + }, + { + "event": "space:join-batch", + "payload": { + "clientVersion": "0.27.5", + "spaces": [ + { + "docId": "doc-3", + "spaceId": "space-1", + "spaceType": "workspace", + }, + ], + }, + }, + { + "event": "space:load-doc", + "payload": { + "docId": "doc-3", + "spaceId": "space-1", + "spaceType": "workspace", + }, + }, + { + "event": "space:join-batch", + "payload": { + "clientVersion": "0.27.5", + "spaces": [ + { + "docId": "doc-4", + "spaceId": "space-1", + "spaceType": "workspace", + }, + ], + }, + }, + { + "event": "space:push-doc-update", + "payload": { + "docId": "doc-4", + "spaceId": "space-1", + "spaceType": "workspace", + "update": "AAA=", + }, + }, + { + "event": "space:doc-lifecycle", + "payload": { + "docId": "doc-1", + "lifecycle": "trash", + "spaceId": "space-1", + "spaceType": "workspace", + }, + }, + { + "event": "space:join-batch", + "payload": { + "clientVersion": "0.27.5", + "spaces": [ + { + "docId": "denied", + "spaceId": "space-1", + "spaceType": "workspace", + }, + ], + }, + }, + { + "event": "space:join-batch", + "payload": { + "clientVersion": "0.27.5", + "spaces": [ + { + "docId": "doc-1", + "spaceId": "space-1", + "spaceType": "workspace", + }, + ], + }, + }, + { + "event": "space:load-doc", + "payload": { + "docId": "doc-1", + "spaceId": "space-1", + "spaceType": "workspace", + "stateVector": undefined, + }, + }, + { + "event": "space:leave-batch", + "payload": { + "docIds": [ + "space-1", + "doc-1", + "doc-2", + "doc-3", + "doc-4", + ], + "spaceId": "space-1", + "spaceType": "workspace", + }, + }, + { + "event": "space:leave-batch", + "payload": { + "docIds": [], + "spaceId": "space-1", + "spaceType": "workspace", + }, + }, + ], + "lifecycle": { + "rootUpdate": Any, + "timestamp": Any, + }, +} +`; diff --git a/packages/common/nbstore/src/__tests__/cloud-blob.spec.ts b/packages/common/nbstore/src/__tests__/cloud-blob.spec.ts index 3d830c7798..98e9cdc006 100644 --- a/packages/common/nbstore/src/__tests__/cloud-blob.spec.ts +++ b/packages/common/nbstore/src/__tests__/cloud-blob.spec.ts @@ -1,17 +1,23 @@ +import { getEventListeners } from 'node:events'; + +import { UserFriendlyError } from '@affine/error'; import { abortBlobUploadMutation, BlobUploadMethod, completeBlobUploadMutation, createBlobUploadMutation, getBlobUploadPartUrlQuery, + listBlobsQuery, setBlobMutation, workspaceBlobQuotaQuery, } from '@affine/graphql'; import { afterEach, expect, test, vi } from 'vitest'; import { CloudBlobStorage } from '../impls/cloud/blob'; +import { BlobSourceRegistry } from '../impls/cloud/blob-source-registry'; +import { OverSizeError } from '../storage'; -const originalBuildConfig = (globalThis as any).BUILD_CONFIG; +const originalBuildConfig = globalThis.BUILD_CONFIG; const quotaResponse = { workspace: { quota: { @@ -24,9 +30,10 @@ const quotaResponse = { }; afterEach(() => { + vi.useRealTimers(); vi.restoreAllMocks(); vi.unstubAllGlobals(); - (globalThis as any).BUILD_CONFIG = originalBuildConfig; + globalThis.BUILD_CONFIG = originalBuildConfig; }); function createStorage() { @@ -57,7 +64,9 @@ test('uses graphql upload when server returns GRAPHQL method', async () => { throw new Error('Unexpected query'); }); - (storage.connection as any).gql = gqlMock; + vi.spyOn(storage.connection, 'gql').mockImplementation( + gqlMock as typeof storage.connection.gql + ); await storage.set({ key: 'blob-key', @@ -70,100 +79,105 @@ test('uses graphql upload when server returns GRAPHQL method', async () => { expect(queries).toContain(setBlobMutation); }); -test('falls back to graphql when presigned upload fails', async () => { - const storage = createStorage(); - const gqlMock = vi.fn(async ({ query }) => { - if (query === workspaceBlobQuotaQuery) { - return quotaResponse; - } - if (query === createBlobUploadMutation) { - return { - createBlobUpload: { - method: BlobUploadMethod.PRESIGNED, - blobKey: 'blob-key', - alreadyUploaded: false, - uploadUrl: 'https://upload.example.com/blob', - }, - }; - } - if (query === setBlobMutation) { - return { setBlob: 'blob-key' }; - } - if (query === completeBlobUploadMutation) { - return { completeBlobUpload: 'blob-key' }; - } - throw new Error('Unexpected query'); - }); - - (storage.connection as any).gql = gqlMock; - vi.stubGlobal( - 'fetch', - vi.fn(async () => new Response('', { status: 500 })) - ); - - await storage.set({ - key: 'blob-key', - data: new Uint8Array([1, 2, 3]), - mime: 'text/plain', - }); - - const queries = gqlMock.mock.calls.map(call => call[0].query); - expect(queries).toContain(setBlobMutation); - expect(queries).not.toContain(completeBlobUploadMutation); -}); - -test('falls back to graphql and aborts when multipart upload fails', async () => { - const storage = createStorage(); - const gqlMock = vi.fn(async ({ query }) => { - if (query === workspaceBlobQuotaQuery) { - return quotaResponse; - } - if (query === createBlobUploadMutation) { - return { - createBlobUpload: { - method: BlobUploadMethod.MULTIPART, - blobKey: 'blob-key', - alreadyUploaded: false, - uploadId: 'upload-1', - partSize: 2, - uploadedParts: [], - }, - }; - } - if (query === getBlobUploadPartUrlQuery) { - return { - workspace: { - blobUploadPartUrl: { - uploadUrl: 'https://upload.example.com/part', +test.each( + [BlobUploadMethod.PRESIGNED, BlobUploadMethod.MULTIPART].flatMap(method => + ['500', '413', 'complete-413', 'abort', 'abort-string', 'pre-abort'].map( + failure => ({ method, failure }) + ) + ) +)( + 'handles $method upload failure $failure without retrying terminal errors', + async ({ method, failure }) => { + const storage = createStorage(); + const controller = new AbortController(); + const reason = + failure === 'abort-string' + ? 'caller canceled' + : new DOMException('caller canceled', 'AbortError'); + const gqlMock = vi.fn(async ({ query, context }) => { + if (query === workspaceBlobQuotaQuery) return quotaResponse; + if (query === createBlobUploadMutation) { + return { + createBlobUpload: { + method, + blobKey: 'blob-key', + alreadyUploaded: false, + uploadUrl: 'https://upload.example.com/blob', + uploadId: 'upload-1', + partSize: 2, + uploadedParts: [], }, - }, - }; - } - if (query === abortBlobUploadMutation) { - return { abortBlobUpload: true }; - } - if (query === setBlobMutation) { - return { setBlob: 'blob-key' }; - } - throw new Error('Unexpected query'); - }); + }; + } + if (query === getBlobUploadPartUrlQuery) { + return { + workspace: { + blobUploadPartUrl: { uploadUrl: 'https://upload.example.com/part' }, + }, + }; + } + if (query === abortBlobUploadMutation) { + expect(context?.signal?.aborted).not.toBe(true); + if (failure === '413') throw new Error('cleanup failed'); + return { abortBlobUpload: true }; + } + if (query === setBlobMutation) return { setBlob: 'blob-key' }; + if (query === completeBlobUploadMutation) { + throw new UserFriendlyError({ + status: 413, + code: 'CONTENT_TOO_LARGE', + type: 'CONTENT_TOO_LARGE', + name: 'CONTENT_TOO_LARGE', + message: 'Content too large', + }); + } + throw new Error('Unexpected query'); + }); + vi.spyOn(storage.connection, 'gql').mockImplementation( + gqlMock as typeof storage.connection.gql + ); + const fetchMock = vi.fn(async (_input: string, init?: RequestInit) => { + expect(init?.signal).toBe(controller.signal); + if (failure.startsWith('abort')) { + controller.abort(reason); + throw init?.signal?.reason; + } + return new Response('', { + status: failure === 'complete-413' ? 200 : Number(failure), + headers: { etag: 'part-etag' }, + }); + }); + vi.stubGlobal('fetch', fetchMock); + if (failure === 'pre-abort') controller.abort(reason); - (storage.connection as any).gql = gqlMock; - vi.stubGlobal( - 'fetch', - vi.fn(async () => new Response('', { status: 500 })) - ); + const uploading = storage.set( + { + key: 'blob-key', + data: new Uint8Array([1, 2, 3]), + mime: 'text/plain', + }, + controller.signal + ); + if (failure === '500') { + await expect(uploading).resolves.toBeUndefined(); + } else if (failure.includes('413')) { + await expect(uploading).rejects.toBeInstanceOf(OverSizeError); + } else { + await expect(uploading).rejects.toBe(reason); + } - await storage.set({ - key: 'blob-key', - data: new Uint8Array([1, 2, 3]), - mime: 'text/plain', - }); - - const queries = gqlMock.mock.calls.map(call => call[0].query); - expect(queries).toContain(abortBlobUploadMutation); - expect(queries).toContain(setBlobMutation); -}); + const queries = new Set(gqlMock.mock.calls.map(call => call[0].query)); + expect(queries.has(setBlobMutation)).toBe(failure === '500'); + expect(queries.has(abortBlobUploadMutation)).toBe( + method === BlobUploadMethod.MULTIPART && failure !== 'pre-abort' + ); + expect(getEventListeners(controller.signal, 'abort')).toHaveLength(0); + if (failure === 'pre-abort') { + expect(gqlMock).not.toHaveBeenCalled(); + expect(fetchMock).not.toHaveBeenCalled(); + } + } +); test('uses presigned upload and completes without graphql fallback', async () => { const storage = createStorage(); @@ -187,7 +201,9 @@ test('uses presigned upload and completes without graphql fallback', async () => throw new Error('Unexpected query'); }); - (storage.connection as any).gql = gqlMock; + vi.spyOn(storage.connection, 'gql').mockImplementation( + gqlMock as typeof storage.connection.gql + ); const fetchMock = vi.fn(async () => new Response('', { status: 200 })); vi.stubGlobal('fetch', fetchMock); @@ -210,6 +226,7 @@ test('uses presigned upload and completes without graphql fallback', async () => test('uses multipart upload and completes without graphql fallback', async () => { const storage = createStorage(); + const controller = new AbortController(); const gqlMock = vi.fn(async ({ query, variables }) => { if (query === workspaceBlobQuotaQuery) { return quotaResponse; @@ -241,8 +258,11 @@ test('uses multipart upload and completes without graphql fallback', async () => throw new Error('Unexpected query'); }); - (storage.connection as any).gql = gqlMock; + vi.spyOn(storage.connection, 'gql').mockImplementation( + gqlMock as typeof storage.connection.gql + ); const fetchMock = vi.fn(async (_input: string, init?: RequestInit) => { + expect(init?.signal).toBe(controller.signal); const body = init?.body as ArrayBuffer; const length = body.byteLength; return new Response('', { @@ -254,65 +274,670 @@ test('uses multipart upload and completes without graphql fallback', async () => }); vi.stubGlobal('fetch', fetchMock); - await storage.set({ - key: 'blob-key', - data: new Uint8Array([1, 2, 3]), - mime: 'text/plain', - }); + await storage.set( + { + key: 'blob-key', + data: new Uint8Array([1, 2, 3]), + mime: 'text/plain', + }, + controller.signal + ); const queries = gqlMock.mock.calls.map(call => call[0].query); expect(queries).toContain(getBlobUploadPartUrlQuery); expect(queries).toContain(completeBlobUploadMutation); expect(queries).not.toContain(setBlobMutation); expect(fetchMock).toHaveBeenCalledTimes(2); + expect(getEventListeners(controller.signal, 'abort')).toHaveLength(0); }); -test('uses manual redirect when downloading blobs on mobile', async () => { - (globalThis as any).BUILD_CONFIG = { - ...originalBuildConfig, - appVersion: 'test', - isAndroid: true, - isIOS: false, - isElectron: false, - }; +test.each(['success', 'failure', 'abort', 'pre-abort', 'timeout'])( + 'blob HTTP transport preserves cancellation and releases timers on %s', + async outcome => { + vi.useFakeTimers(); + const storage = createStorage(); + const controller = new AbortController(); + const reason = new DOMException('caller canceled', 'AbortError'); + const fetchMock = vi.fn(async (_input: URL, init?: RequestInit) => { + if (outcome === 'success') return new Response('ok'); + if (outcome === 'failure') throw new Error('offline'); + const signal = init!.signal!; + return new Promise((_resolve, reject) => { + signal.addEventListener('abort', () => reject(signal.reason), { + once: true, + }); + }); + }); + vi.stubGlobal('fetch', fetchMock); + if (outcome === 'pre-abort') controller.abort(reason); + const pending = storage.connection.fetch('/blob', { + signal: controller.signal, + timeout: 1000, + }); + const result = pending.then( + value => value, + error => error + ); + if (outcome === 'abort') controller.abort(reason); + if (outcome === 'timeout') await vi.advanceTimersByTimeAsync(1000); + const settled = await result; + if (outcome === 'success') { + expect(settled).toBeInstanceOf(Response); + } else if (outcome === 'abort' || outcome === 'pre-abort') { + expect(settled).toBe(reason); + } else { + expect(UserFriendlyError.fromAny(settled).is('NETWORK_ERROR')).toBe(true); + } + expect(vi.getTimerCount()).toBe(0); + expect(getEventListeners(controller.signal, 'abort')).toHaveLength(0); + if (outcome === 'pre-abort') expect(fetchMock).not.toHaveBeenCalled(); + } +); - vi.resetModules(); - const { CloudBlobStorage: MobileCloudBlobStorage } = - await import('../impls/cloud/blob'); - const storage = new MobileCloudBlobStorage({ - serverBaseUrl: 'https://example.com', - id: 'workspace-1', - }); +test('downloads only through registered source-scoped V1 entries', async () => { + const storage = createStorage(); + await expect(storage.get('blob-key')).rejects.toThrow( + 'Blob source context is required' + ); + const first = { + type: 'currentDoc' as const, + workspaceId: 'workspace-1', + docId: 'doc-1', + }; + const second = { + type: 'history' as const, + workspaceId: 'workspace-1', + docId: 'doc-2', + timestampMs: 1720000000000, + }; const fetchMock = vi .fn() .mockResolvedValueOnce( new Response( - JSON.stringify({ url: 'https://cdn.example.com/blob-key' }), + JSON.stringify({ + version: 1, + entries: [ + { key: 'blob-key', mime: 'text/plain', size: 9, source: first }, + ], + }), { status: 200, - headers: { - 'content-type': 'application/json', - }, + headers: { 'content-type': 'application/json' }, } ) ) + .mockResolvedValueOnce( + new Response( + JSON.stringify({ + version: 1, + entries: [ + { key: 'blob-key', mime: 'text/plain', size: 9, source: second }, + ], + }), + { status: 200, headers: { 'content-type': 'application/json' } } + ) + ) + .mockResolvedValueOnce( + new Response( + JSON.stringify({ + status: 403, + code: 'ACTION_FORBIDDEN', + type: 'ACTION_FORBIDDEN', + name: 'DOC_ACTION_DENIED', + message: 'denied', + }), + { status: 403, headers: { 'content-type': 'application/json' } } + ) + ) .mockResolvedValueOnce( new Response('blob-data', { status: 200, - headers: { - 'content-type': 'text/plain', - }, + headers: { 'content-type': 'text/plain' }, + }) + ) + .mockResolvedValueOnce( + new Response('blob-data', { + status: 200, + headers: { 'content-type': 'text/plain' }, }) ); vi.stubGlobal('fetch', fetchMock); + await storage.registerSource(first); + await storage.registerSource(second); const blob = await storage.get('blob-key'); + const retried = await storage.get('blob-key'); expect(blob?.data).toEqual(new TextEncoder().encode('blob-data')); - expect(fetchMock.mock.calls[0]?.[0]?.toString()).toBe( - 'https://example.com/api/workspaces/workspace-1/blobs/blob-key?redirect=manual' + expect(retried?.data).toEqual(new TextEncoder().encode('blob-data')); + const urls = fetchMock.mock.calls.map(call => call[0]?.toString()); + expect(urls).toMatchInlineSnapshot(` + [ + "https://example.com/api/workspaces/workspace-1/blob-manifest/v1?sourceType=currentDoc&docId=doc-1", + "https://example.com/api/workspaces/workspace-1/blob-manifest/v1?sourceType=history&docId=doc-2×tampMs=1720000000000", + "https://example.com/api/workspaces/workspace-1/blobs/v1/blob-key?sourceType=currentDoc&docId=doc-1", + "https://example.com/api/workspaces/workspace-1/blobs/v1/blob-key?sourceType=history&docId=doc-2×tampMs=1720000000000", + "https://example.com/api/workspaces/workspace-1/blobs/v1/blob-key?sourceType=history&docId=doc-2×tampMs=1720000000000", + ] + `); + expect(urls.some(url => url?.includes('redirect=manual'))).toBe(false); + await Promise.all([ + storage.unregisterSource(first), + storage.unregisterSource(second), + ]); + await expect(storage.get('blob-key', undefined, second)).rejects.toThrow( + 'Blob source context is required' ); - expect(fetchMock.mock.calls[1]?.[0]?.toString()).toBe( - 'https://cdn.example.com/blob-key' + expect(fetchMock).toHaveBeenCalledTimes(5); + + fetchMock + .mockResolvedValueOnce( + new Response( + JSON.stringify({ + version: 1, + entries: [ + { key: 'failed-blob', mime: 'text/plain', size: 1, source: second }, + ], + }), + { status: 200, headers: { 'content-type': 'application/json' } } + ) + ) + .mockResolvedValueOnce(new Response('', { status: 500 })); + await expect( + (async () => { + await storage.registerSource(second); + try { + return await storage.get('failed-blob', undefined, second); + } finally { + await storage.unregisterSource(second); + } + })() + ).rejects.toBeDefined(); + await expect(storage.get('failed-blob', undefined, second)).rejects.toThrow( + 'Blob source context is required' + ); + expect(fetchMock.mock.calls.slice(-2).map(call => call[0]?.toString())) + .toMatchInlineSnapshot(` + [ + "https://example.com/api/workspaces/workspace-1/blob-manifest/v1?sourceType=history&docId=doc-2×tampMs=1720000000000", + "https://example.com/api/workspaces/workspace-1/blobs/v1/failed-blob?sourceType=history&docId=doc-2×tampMs=1720000000000", + ] + `); + + fetchMock + .mockResolvedValueOnce(new Response('', { status: 500 })) + .mockResolvedValueOnce( + new Response( + JSON.stringify({ + version: 1, + entries: [ + { + key: 'recovered-blob', + mime: 'text/plain', + size: 9, + source: second, + }, + ], + }), + { status: 200, headers: { 'content-type': 'application/json' } } + ) + ) + .mockResolvedValueOnce( + new Response('recovered', { + status: 200, + headers: { 'content-type': 'text/plain' }, + }) + ); + await expect(storage.registerSource(second)).rejects.toBeDefined(); + const recovered = await storage.get('recovered-blob', undefined, second); + expect({ + data: recovered && new TextDecoder().decode(recovered.data), + urls: fetchMock.mock.calls.slice(-3).map(call => call[0]?.toString()), + }).toMatchInlineSnapshot(` + { + "data": "recovered", + "urls": [ + "https://example.com/api/workspaces/workspace-1/blob-manifest/v1?sourceType=history&docId=doc-2×tampMs=1720000000000", + "https://example.com/api/workspaces/workspace-1/blob-manifest/v1?sourceType=history&docId=doc-2×tampMs=1720000000000", + "https://example.com/api/workspaces/workspace-1/blobs/v1/recovered-blob?sourceType=history&docId=doc-2×tampMs=1720000000000", + ], + } + `); + await storage.unregisterSource(second); + + fetchMock.mockImplementation( + async () => + new Response(JSON.stringify({ version: 1, entries: [] }), { + status: 200, + headers: { 'content-type': 'application/json' }, + }) + ); + await storage.registerSource(first); + await expect(storage.get('absent')).resolves.toBeNull(); + await expect(storage.get('absent', undefined, first)).resolves.toBeNull(); + await expect(storage.get('absent', undefined, second)).rejects.toThrow( + 'Blob source context is required' + ); + fetchMock.mockRejectedValueOnce(new Error('manifest offline')); + await expect(storage.get('absent', undefined, first)).rejects.toThrow( + 'manifest offline' + ); + const canceled = new AbortController(); + canceled.abort(new DOMException('canceled', 'AbortError')); + const requests = fetchMock.mock.calls.length; + await expect(storage.get('absent', canceled.signal, first)).rejects.toBe( + canceled.signal.reason + ); + expect(fetchMock).toHaveBeenCalledTimes(requests); + await storage.unregisterSource(first); +}); + +test('keeps an unregistered source denied across an in-flight download', async () => { + const storage = createStorage(); + const source = { + type: 'currentDoc' as const, + workspaceId: 'workspace-1', + docId: 'doc-1', + }; + let releaseDownload!: (response: Response) => void; + const download = new Promise(resolve => { + releaseDownload = resolve; + }); + const fetchMock = vi + .fn() + .mockResolvedValueOnce( + new Response( + JSON.stringify({ + version: 1, + entries: [{ key: 'stale', mime: 'text/plain', size: 1, source }], + }), + { status: 200, headers: { 'content-type': 'application/json' } } + ) + ) + .mockReturnValueOnce(download); + vi.stubGlobal('fetch', fetchMock); + + await storage.registerSource(source); + const reading = storage.get('stale'); + await vi.waitFor(() => expect(fetchMock).toHaveBeenCalledTimes(2)); + await storage.unregisterSource(source); + releaseDownload( + new Response('stale-bytes', { + status: 200, + headers: { 'content-type': 'text/plain' }, + }) + ); + await expect(reading).resolves.toBeNull(); + await expect(storage.get('stale')).rejects.toThrow( + 'Blob source context is required' + ); + expect(fetchMock).toHaveBeenCalledTimes(2); + + let releaseRefresh!: (response: Response) => void; + const refreshingManifest = new Promise(resolve => { + releaseRefresh = resolve; + }); + fetchMock + .mockReturnValueOnce(refreshingManifest) + .mockResolvedValueOnce( + new Response( + JSON.stringify({ + version: 1, + entries: [{ key: 'fresh-key', mime: 'text/plain', size: 5, source }], + }), + { status: 200, headers: { 'content-type': 'application/json' } } + ) + ) + .mockResolvedValueOnce( + new Response('fresh', { + status: 200, + headers: { 'content-type': 'text/plain' }, + }) + ); + const refresh = storage.registerSource(source); + const dirtyRefresh = storage.registerSource(source); + releaseRefresh( + new Response( + JSON.stringify({ + version: 1, + entries: [{ key: 'stale', mime: 'text/plain', size: 1, source }], + }), + { status: 200, headers: { 'content-type': 'application/json' } } + ) + ); + await Promise.all([refresh, dirtyRefresh]); + await expect(storage.get('fresh-key')).resolves.toMatchObject({ + data: new TextEncoder().encode('fresh'), + }); + expect(fetchMock).toHaveBeenCalledTimes(5); +}); + +test('pages readable workspace sources without workspace inventory fallback', async () => { + const storage = createStorage(); + const source = (docId: string) => ({ + type: 'currentDoc' as const, + workspaceId: 'workspace-1', + docId, + }); + const fetchMock = vi + .fn() + .mockResolvedValueOnce( + new Response(JSON.stringify({ version: 1, entries: [] }), { + status: 200, + headers: { 'content-type': 'application/json' }, + }) + ) + .mockResolvedValueOnce( + new Response( + JSON.stringify({ + version: 1, + entries: [ + { key: 'one', mime: 'text/plain', size: 1, source: source('a') }, + ], + nextCursor: 'a', + }), + { status: 200, headers: { 'content-type': 'application/json' } } + ) + ) + .mockResolvedValueOnce( + new Response('1', { + status: 200, + headers: { 'content-type': 'text/plain' }, + }) + ) + .mockResolvedValueOnce( + new Response( + JSON.stringify({ + version: 1, + entries: [ + { key: 'two', mime: 'text/plain', size: 1, source: source('b') }, + ], + }), + { status: 200, headers: { 'content-type': 'application/json' } } + ) + ); + vi.stubGlobal('fetch', fetchMock); + + await storage.registerSource(source('a')); + + const entries = storage.readableSources()[Symbol.asyncIterator](); + await expect(entries.next()).resolves.toMatchObject({ + value: { key: 'one' }, + done: false, + }); + await storage.unregisterSource(source('a')); + expect(fetchMock).toHaveBeenCalledTimes(2); + await expect( + storage.get('one', undefined, source('a')) + ).resolves.toMatchObject({ key: 'one' }); + await expect(entries.next()).resolves.toMatchObject({ + value: { key: 'two' }, + done: false, + }); + expect(fetchMock).toHaveBeenCalledTimes(4); + await expect(entries.next()).resolves.toEqual({ + value: undefined, + done: true, + }); + expect(fetchMock.mock.calls[3]?.[0]?.toString()).toContain('cursor=a'); + await expect(storage.get('two')).rejects.toThrow( + 'Blob source context is required' + ); + await expect(storage.list()).rejects.toThrow( + 'Workspace blob inventory is unavailable' + ); +}); + +test('uses the managed workspace inventory only through its typed query', async () => { + const storage = createStorage(); + const gqlMock = vi.fn(async ({ query }) => { + expect(query).toBe(listBlobsQuery); + return { + workspace: { + blobs: [ + { + key: 'managed', + mime: 'text/plain', + size: 7, + createdAt: '2026-08-29T00:00:00.000Z', + }, + ], + }, + }; + }); + vi.spyOn(storage.connection, 'gql').mockImplementation( + gqlMock as typeof storage.connection.gql + ); + + expect(await storage.listManageable()).toEqual([ + { + key: 'managed', + mime: 'text/plain', + size: 7, + createdAt: new Date('2026-08-29T00:00:00.000Z'), + }, + ]); + await expect(storage.list()).rejects.toThrow( + 'Workspace blob inventory is unavailable' + ); +}); + +test('releases transient workspace sources and preserves owned registrations', async () => { + const storage = createStorage(); + const source = { + type: 'currentDoc' as const, + workspaceId: 'workspace-1', + docId: 'doc-1', + }; + const entry = { key: 'stable', mime: 'text/plain', size: 4, source }; + const fetchMock = vi + .fn() + .mockResolvedValueOnce( + new Response(JSON.stringify({ version: 1, entries: [entry] }), { + status: 200, + headers: { 'content-type': 'application/json' }, + }) + ) + .mockResolvedValueOnce( + new Response( + JSON.stringify({ + version: 1, + entries: [{ key: 'partial', mime: 'text/plain', size: 1, source }], + nextCursor: 'next', + }), + { status: 200, headers: { 'content-type': 'application/json' } } + ) + ) + .mockResolvedValueOnce(new Response('', { status: 500 })) + .mockResolvedValueOnce( + new Response('keep', { + status: 200, + headers: { 'content-type': 'text/plain' }, + }) + ) + .mockResolvedValueOnce( + new Response(JSON.stringify({ version: 1, entries: [] }), { + status: 200, + headers: { 'content-type': 'application/json' }, + }) + ) + .mockResolvedValueOnce( + new Response('keep', { + status: 200, + headers: { 'content-type': 'text/plain' }, + }) + ); + vi.stubGlobal('fetch', fetchMock); + + await storage.registerSource(source); + await expect(async () => { + for await (const _entry of storage.readableSources()) { + // Consume until the next page fails. + } + }).rejects.toThrow(); + expect((await storage.get('stable'))?.data).toEqual( + new TextEncoder().encode('keep') + ); + + for await (const _entry of storage.readableSources()) { + // A complete empty workspace generation must also release its page state. + } + expect((await storage.get('stable'))?.data).toEqual( + new TextEncoder().encode('keep') + ); + await storage.unregisterSource(source); + await expect(storage.get('stable')).rejects.toThrow( + 'Blob source context is required' + ); + + const registry = new BlobSourceRegistry(); + const sources = ['one', 'two', 'three'].map(docId => ({ + type: 'currentDoc' as const, + workspaceId: 'workspace-1', + docId, + })); + const record = (source: (typeof sources)[number]) => ({ + key: source.docId, + mime: 'text/plain', + size: 1, + source, + }); + registry.replaceOwned(sources[0], [record(sources[0])], {}); + registry.replaceOwned(sources[1], [record(sources[1])], {}); + registry.replaceOwned(sources[2], [record(sources[2])], {}); + expect( + ['one', 'two', 'three'].map(key => + registry.candidates(key).map(candidate => candidate.source.docId) + ) + ).toEqual([['one'], ['two'], ['three']]); + for (let index = 0; index < 256; index++) { + const source = { + type: 'currentDoc' as const, + workspaceId: 'workspace-1', + docId: `owned-${index}`, + }; + registry.replaceOwned(source, [record(source)], {}); + } + expect(registry.candidates('one')).toHaveLength(1); + registry.removeOwned(sources[1]); + expect(registry.candidates('two')).toEqual([]); + const released = new BlobSourceRegistry(); + for (let index = 0; index < 1000; index++) { + const source = { + type: 'currentDoc' as const, + workspaceId: 'workspace-1', + docId: `removed-${index}`, + }; + released.replaceOwned(source, [record(source)], {}); + released.removeOwned(source); + } + expect( + ['removed-0', 'removed-999'].flatMap(key => released.candidates(key)) + ).toEqual([]); + + const pendingStorage = createStorage(); + const pendingSources = Array.from({ length: 33 }, (_, index) => ({ + type: 'currentDoc' as const, + workspaceId: 'workspace-1', + docId: `pending-${index}`, + })); + const pendingFetch = vi.fn((input: RequestInfo | URL, init?: RequestInit) => { + if (input.toString().includes('docId=pending-32')) { + return Promise.resolve( + new Response(JSON.stringify({ version: 1, entries: [] }), { + status: 200, + headers: { 'content-type': 'application/json' }, + }) + ); + } + return new Promise((_resolve, reject) => { + init?.signal?.addEventListener( + 'abort', + () => reject(new DOMException('Aborted', 'AbortError')), + { once: true } + ); + }); + }); + vi.stubGlobal('fetch', pendingFetch); + const pending = pendingSources + .slice(0, 32) + .map(source => + pendingStorage.registerSource(source).catch((error: unknown) => error) + ); + const dirty = pendingStorage + .registerSource(pendingSources[0]) + .catch((error: unknown) => error); + const unregistering = pendingStorage.unregisterSource(pendingSources[0]); + await expect( + pendingStorage.registerSource(pendingSources[32]) + ).rejects.toThrow('Blob source registration budget exceeded'); + await unregistering; + await pending[0]; + await pendingStorage.registerSource(pendingSources[32]); + await dirty; + const fetchCount = pendingFetch.mock.calls.length; + await expect( + pendingStorage.get('unregistered', undefined, pendingSources[32]) + ).resolves.toBeNull(); + expect(pendingFetch).toHaveBeenCalledTimes(fetchCount + 1); + await pendingStorage.unregisterSource(pendingSources[32]); + await Promise.all( + pendingSources + .slice(1, 32) + .map(source => pendingStorage.unregisterSource(source)) + ); + await Promise.all(pending); + + const contended = createStorage(); + const registered = Array.from({ length: 64 }, (_, index) => ({ + type: 'currentDoc' as const, + workspaceId: 'workspace-1', + docId: `contended-${index}`, + })); + const releases: Array<() => void> = []; + let holdRefresh = false; + vi.stubGlobal( + 'fetch', + vi.fn(async (input: RequestInfo | URL) => { + const url = new URL(input.toString()); + if (url.pathname.includes('/blobs/v1/')) return new Response('found'); + const docId = url.searchParams.get('docId'); + if (holdRefresh) { + await new Promise(resolve => releases.push(resolve)); + } + return new Response( + JSON.stringify({ + version: 1, + entries: + holdRefresh && docId === registered[63].docId + ? [ + { + key: 'after-budget', + mime: 'text/plain', + size: 5, + source: registered[63], + }, + ] + : [], + }), + { headers: { 'content-type': 'application/json' } } + ); + }) + ); + for (const source of registered) await contended.registerSource(source); + holdRefresh = true; + const refreshing = registered + .slice(32) + .map(source => contended.registerSource(source)); + expect(releases).toHaveLength(32); + const reading = contended.get('after-budget').then( + value => value, + error => error + ); + for (const release of releases) release(); + await Promise.all(refreshing); + await expect(reading).resolves.toMatchObject({ key: 'after-budget' }); + await Promise.all( + registered.map(source => contended.unregisterSource(source)) ); }); diff --git a/packages/common/nbstore/src/__tests__/cloud-doc-updates.spec.ts b/packages/common/nbstore/src/__tests__/cloud-doc-updates.spec.ts index 22aa0512ab..f5a3877c5b 100644 --- a/packages/common/nbstore/src/__tests__/cloud-doc-updates.spec.ts +++ b/packages/common/nbstore/src/__tests__/cloud-doc-updates.spec.ts @@ -8,6 +8,7 @@ const base64UpdateB = 'BAUG'; class FakeSocket { connected = true; + readonly joinedDocs = new Set(); readonly emitted: Array<{ event: string; payload: unknown }> = []; readonly handlers = new Map void>(); @@ -33,8 +34,26 @@ class FakeSocket { return true; } - async emitWithAck(event: string, payload: unknown) { + async emitWithAck( + event: string, + payload: { docId?: string; spaces?: { docId?: string }[] } + ) { this.emitted.push({ event, payload }); + if (event === 'space:join-batch') { + for (const space of payload.spaces ?? []) { + if (space.docId === 'denied') { + return { error: { name: 'DOC_ACTION_DENIED', message: 'denied' } }; + } + if (space.docId) this.joinedDocs.add(space.docId); + } + } + if (event === 'space:load-doc' || event === 'space:push-doc-update') { + expect(this.joinedDocs.has(payload.docId!)).toBe(true); + return { data: { missing: 'AAA=', state: 'AA==', timestamp: 1_000 } }; + } + if (event === 'space:doc-lifecycle') { + return { data: { rootUpdate: base64UpdateA, timestamp: 1_000 } }; + } return { data: { clientId: 'client-1', success: true } }; } } @@ -45,7 +64,6 @@ describe('CloudDocStorage broadcast updates', () => { id: 'space-1', serverBaseUrl: 'http://localhost', isSelfHosted: true, - syncProtocol: 'legacy', type: 'workspace', readonlyMode: true, }); @@ -79,7 +97,6 @@ describe('CloudDocStorage broadcast updates', () => { id: 'space-1', serverBaseUrl: 'http://localhost', isSelfHosted: true, - syncProtocol: 'batch', type: 'workspace', readonlyMode: true, }); @@ -114,123 +131,94 @@ describe('CloudDocStorage broadcast updates', () => { expect(received[0]?.bin).toEqual(new Uint8Array()); }); - test.each([ - ['legacy', 'space:join'], - ['batch', 'space:join-batch'], - ] as const)( - '%s route sends its own join event', - async (syncProtocol, event) => { - vi.stubGlobal('BUILD_CONFIG', { appVersion: '0.27.5' }); - const fakeSocket = new FakeSocket(); - const disconnect = vi.fn(); - const storage = new CloudDocStorage({ - id: 'space-1', - serverBaseUrl: 'http://localhost', - isSelfHosted: true, - syncProtocol, - type: 'workspace', - readonlyMode: true, - }); - const connection = storage.connection as any; + test('batch route joins the workspace and applies lifecycle commands', async () => { + vi.stubGlobal('BUILD_CONFIG', { appVersion: '0.27.5' }); + const fakeSocket = new FakeSocket(); + const disconnect = vi.fn(); + const storage = new CloudDocStorage({ + id: 'space-1', + serverBaseUrl: 'http://localhost', + isSelfHosted: true, + type: 'workspace', + readonlyMode: true, + }); + const connection = storage.connection as any; - Object.defineProperty(connection, 'manager', { - configurable: true, - value: { - connect: () => ({ socket: fakeSocket, disconnect }), - }, - }); - vi.spyOn(connection, 'getIdConverter').mockResolvedValue({ - oldIdToNewId: (id: string) => id, - newIdToOldId: (id: string) => id, - }); + Object.defineProperty(connection, 'manager', { + configurable: true, + value: { + connect: () => ({ socket: fakeSocket, disconnect }), + }, + }); + const inner = await connection.doConnect(); + connection._inner = inner; + await storage.getDocSnapshot('doc-1'); + await storage.getDocDiff('doc-2'); + await storage.getDocTimestamp('doc-3'); + await storage.pushDocUpdate({ + docId: 'doc-4', + bin: new Uint8Array([0, 0]), + }); + const lifecycle = await storage.applyDocLifecycle('doc-1', 'trash'); + await expect(storage.getDocSnapshot('denied')).rejects.toMatchObject({ + name: 'DOC_ACTION_DENIED', + }); + fakeSocket.joinedDocs.delete('doc-1'); + await storage.getDocDiff('doc-1'); + connection.doDisconnect(inner); + expect({ emitted: fakeSocket.emitted, lifecycle }).toMatchSnapshot({ + lifecycle: { + rootUpdate: expect.any(Uint8Array), + timestamp: expect.any(Date), + }, + }); - const inner = await connection.doConnect(); - expect(fakeSocket.emitted[0]?.event).toBe(event); + expect(disconnect).toHaveBeenCalledOnce(); + vi.unstubAllGlobals(); + }); - inner.disconnect(); - vi.unstubAllGlobals(); - } - ); + test('awareness joins active documents through the batch route', async () => { + vi.stubGlobal('BUILD_CONFIG', { appVersion: '0.27.5' }); + const fakeSocket = new FakeSocket(); + const storage = new CloudAwarenessStorage({ + id: 'space-1', + serverBaseUrl: 'http://localhost', + isSelfHosted: true, + type: 'workspace', + }); - test.each([ - ['legacy', 'space:join-awareness'], - ['batch', 'space:join-batch'], - ] as const)( - '%s awareness joins for active documents', - async (syncProtocol, event) => { - vi.stubGlobal('BUILD_CONFIG', { appVersion: '0.27.5' }); - const fakeSocket = new FakeSocket(); - const storage = new CloudAwarenessStorage({ - id: 'space-1', - serverBaseUrl: 'http://localhost', - isSelfHosted: true, - syncProtocol, - type: 'workspace', - }); + Object.defineProperty(storage, 'connection', { + configurable: true, + value: { + status: 'connected', + inner: { socket: fakeSocket }, + onStatusChanged: () => () => {}, + }, + }); - Object.defineProperty(storage, 'connection', { - configurable: true, - value: { - status: 'connected', - inner: { socket: fakeSocket }, - onStatusChanged: () => () => {}, - }, - }); + const unsubscribeA = storage.subscribeUpdate( + 'doc-a', + () => {}, + async () => null + ); + const unsubscribeB = storage.subscribeUpdate( + 'doc-b', + () => {}, + async () => null + ); - const unsubscribeA = storage.subscribeUpdate( - 'doc-a', - () => {}, - async () => null - ); - const unsubscribeB = storage.subscribeUpdate( - 'doc-b', - () => {}, - async () => null - ); + await vi.waitFor(() => { + expect( + fakeSocket.emitted.filter( + ({ event: emittedEvent }) => emittedEvent === 'space:join-batch' + ) + ).toHaveLength(1); + }); - await vi.waitFor(() => { - expect( - fakeSocket.emitted.filter( - ({ event: emittedEvent }) => emittedEvent === event - ) - ).toHaveLength(syncProtocol === 'batch' ? 1 : 2); - }); + expect(fakeSocket.emitted).toMatchSnapshot(); - if (syncProtocol === 'batch') { - expect(fakeSocket.emitted).toContainEqual({ - event, - payload: { - spaces: [ - { spaceType: 'workspace', spaceId: 'space-1', docId: 'doc-a' }, - { spaceType: 'workspace', spaceId: 'space-1', docId: 'doc-b' }, - ], - clientVersion: '0.27.5', - }, - }); - } else { - expect(fakeSocket.emitted).toContainEqual({ - event, - payload: { - spaceType: 'workspace', - spaceId: 'space-1', - docId: 'doc-a', - clientVersion: '0.27.5', - }, - }); - expect(fakeSocket.emitted).toContainEqual({ - event, - payload: { - spaceType: 'workspace', - spaceId: 'space-1', - docId: 'doc-b', - clientVersion: '0.27.5', - }, - }); - } - - unsubscribeA(); - unsubscribeB(); - vi.unstubAllGlobals(); - } - ); + unsubscribeA(); + unsubscribeB(); + vi.unstubAllGlobals(); + }); }); diff --git a/packages/common/nbstore/src/__tests__/sync.spec.ts b/packages/common/nbstore/src/__tests__/sync.spec.ts index af981b2309..b8893d808c 100644 --- a/packages/common/nbstore/src/__tests__/sync.spec.ts +++ b/packages/common/nbstore/src/__tests__/sync.spec.ts @@ -1,7 +1,7 @@ import 'fake-indexeddb/auto'; import * as reader from '@affine/reader'; -import { NEVER } from 'rxjs'; +import { firstValueFrom, NEVER } from 'rxjs'; import { afterEach, expect, test, vi } from 'vitest'; import { Doc as YDoc, encodeStateAsUpdate } from 'yjs'; @@ -33,6 +33,7 @@ import { SpaceStorage, } from '../storage'; import { Sync } from '../sync'; +import { BlobSyncPeer } from '../sync/blob/peer'; import { DocSyncPeer } from '../sync/doc/peer'; import { IndexerSyncImpl } from '../sync/indexer'; import { expectYjsEqual } from './utils'; @@ -375,11 +376,17 @@ test('doc', async () => { }, }); const removeRootPriority = sync.doc.addPriority('ws1', 100); + const removeForegroundPriority = sync.doc.addPriority('doc1', 200); + const remoteDiff = vi.spyOn(peerBDoc, 'getDocDiff'); + expect(await firstValueFrom(sync.doc.docState$('doc1'))).toMatchObject({ + synced: false, + }); sync.start(); await new Promise(resolve => setTimeout(resolve, 1000)); { + expect(remoteDiff.mock.calls[0]?.[0]).toBe('ws1'); const b = await peerB.get('doc').getDoc('doc1'); expectYjsEqual(b!.bin, { test: { @@ -448,6 +455,7 @@ test('doc', async () => { } removeDocPriority(); + removeForegroundPriority(); removeRootPriority(); sync.stop(); peerA.disconnect(); @@ -541,6 +549,58 @@ test('blob', async () => { expect(c).not.toBeNull(); expect(c?.data).toEqual(new Uint8Array([4, 3, 2, 1])); } + sync.stop(); + + const localReads = vi.spyOn(a, 'get'); + const localLists = vi.spyOn(a, 'list'); + const remoteReads = vi.spyOn(c, 'get'); + await new BlobSyncPeer('c', a, c, blobSync).fullDownload(); + expect(localReads).not.toHaveBeenCalled(); + expect(localLists).toHaveBeenCalledTimes(1); + expect(remoteReads.mock.calls.map(([key]) => key)).toEqual(['test2']); + remoteReads.mockRestore(); + localLists.mockClear(); + + for (const key of ['fresh', 'retry']) { + await c.set({ key, data: new Uint8Array([1, 2, 3]), mime: 'text/plain' }); + } + const entries = await c.list(); + const scoped = Object.assign(c, { + registerSource: vi.fn(), + unregisterSource: vi.fn(), + async *readableSources() { + for (const entry of entries) { + for (const docId of ['first', 'second']) { + yield { + ...entry, + source: { type: 'currentDoc' as const, workspaceId: 'ws1', docId }, + }; + } + } + }, + }); + const get = c.get.bind(c); + let retryAttempts = 0; + const reads = vi.spyOn(c, 'get').mockImplementation(async key => { + if (key === 'retry' && retryAttempts++ === 0) + throw new Error('source denied'); + return get(key); + }); + const inventory = vi + .spyOn(c, 'list') + .mockRejectedValue(new Error('cloud inventory forbidden')); + await new BlobSyncPeer('scoped', a, scoped, blobSync).fullDownload(); + expect(localReads).not.toHaveBeenCalled(); + expect(localLists).toHaveBeenCalledTimes(1); + expect(inventory).not.toHaveBeenCalled(); + expect(reads.mock.calls.map(([key]) => key)).toEqual([ + 'fresh', + 'retry', + 'retry', + ]); + localReads.mockRestore(); + expect((await a.get('fresh'))?.data).toEqual(new Uint8Array([1, 2, 3])); + expect((await a.get('retry'))?.data).toEqual(new Uint8Array([1, 2, 3])); }); test('doc sync peer stops retrying a doc when remote denies permission', async () => { diff --git a/packages/common/nbstore/src/frontend/blob.ts b/packages/common/nbstore/src/frontend/blob.ts index 6af87f7e97..8b3095fc60 100644 --- a/packages/common/nbstore/src/frontend/blob.ts +++ b/packages/common/nbstore/src/frontend/blob.ts @@ -1,4 +1,4 @@ -import type { BlobRecord, BlobStorage } from '../storage'; +import type { BlobRecord, BlobSource, BlobStorage } from '../storage'; import { SingletonLocker } from '../storage/lock'; import type { BlobSync } from '../sync/blob'; @@ -68,6 +68,14 @@ export class BlobFrontend { return this.sync.uploadBlob(blob, false); } + registerSource(source: BlobSource) { + return this.sync.registerSource(source); + } + + unregisterSource(source: BlobSource) { + return this.sync.unregisterSource(source); + } + fullDownload(peerId?: string, signal?: AbortSignal) { return this.sync.fullDownload(peerId, signal); } diff --git a/packages/common/nbstore/src/frontend/doc.ts b/packages/common/nbstore/src/frontend/doc.ts index 84fb21729c..526e547754 100644 --- a/packages/common/nbstore/src/frontend/doc.ts +++ b/packages/common/nbstore/src/frontend/doc.ts @@ -136,6 +136,13 @@ export class DocFrontend { readonly options: DocFrontendOptions = {} ) {} + applyDocLifecycle(docId: string, lifecycle: 'trash' | 'restore' | 'delete') { + if (!this.storage.applyDocLifecycle) { + throw new Error('Document lifecycle is unavailable'); + } + return this.storage.applyDocLifecycle(docId, lifecycle); + } + private _docState$(docId: string): Observable { const frontendState$ = new Observable<{ ready: boolean; diff --git a/packages/common/nbstore/src/impls/cloud/awareness.ts b/packages/common/nbstore/src/impls/cloud/awareness.ts index 1571b580cd..6d121a2ecd 100644 --- a/packages/common/nbstore/src/impls/cloud/awareness.ts +++ b/packages/common/nbstore/src/impls/cloud/awareness.ts @@ -7,14 +7,12 @@ import { base64ToUint8Array, SocketConnection, SPACE_JOIN_BATCH_LIMIT, - type SyncProtocol, uint8ArrayToBase64, } from './socket'; interface CloudAwarenessStorageOptions { isSelfHosted: boolean; serverBaseUrl: string; - syncProtocol: SyncProtocol; type: SpaceType; id: string; } @@ -61,53 +59,30 @@ export class CloudAwarenessStorage extends AwarenessStorageBase { return; } - if (this.options.syncProtocol === 'batch') { - for ( - let index = 0; - index < pendingIds.length; - index += SPACE_JOIN_BATCH_LIMIT - ) { - const spaces = pendingIds - .slice(index, index + SPACE_JOIN_BATCH_LIMIT) - .map(docId => ({ - spaceType: this.options.type, - spaceId: this.options.id, - docId, - })); - const response = await this.socket.emitWithAck('space:join-batch', { - spaces, - clientVersion: BUILD_CONFIG.appVersion, - }); + for ( + let index = 0; + index < pendingIds.length; + index += SPACE_JOIN_BATCH_LIMIT + ) { + const spaces = pendingIds + .slice(index, index + SPACE_JOIN_BATCH_LIMIT) + .map(docId => ({ + spaceType: this.options.type, + spaceId: this.options.id, + docId, + })); + const response = await this.socket.emitWithAck('space:join-batch', { + spaces, + clientVersion: BUILD_CONFIG.appVersion, + }); - if ('error' in response) { - throw new Error( - `Awareness join failed: ${response.error.name}: ${response.error.message}` - ); - } - if (!response.data.success) { - throw new Error('Awareness join was rejected'); - } - } - } else { - for (const docId of pendingIds) { - const response = await this.socket.emitWithAck( - 'space:join-awareness', - { - spaceType: this.options.type, - spaceId: this.options.id, - docId, - clientVersion: BUILD_CONFIG.appVersion, - } + if ('error' in response) { + throw new Error( + `Awareness join failed: ${response.error.name}: ${response.error.message}` ); - - if ('error' in response) { - throw new Error( - `Awareness join failed: ${response.error.name}: ${response.error.message}` - ); - } - if (!response.data.success) { - throw new Error('Awareness join was rejected'); - } + } + if (!response.data.success) { + throw new Error('Awareness join was rejected'); } } @@ -153,19 +128,11 @@ export class CloudAwarenessStorage extends AwarenessStorageBase { handleBroadcastAwarenessUpdate ); if (this.connection.status !== 'connected') return; - if (this.options.syncProtocol === 'batch') { - this.socket.emit('space:leave-batch', { - spaceType: this.options.type, - spaceId: this.options.id, - docIds: [id], - }); - } else { - this.socket.emit('space:leave-awareness', { - spaceType: this.options.type, - spaceId: this.options.id, - docId: id, - }); - } + this.socket.emit('space:leave-batch', { + spaceType: this.options.type, + spaceId: this.options.id, + docIds: [id], + }); }; // join awareness, and collect awareness from others diff --git a/packages/common/nbstore/src/impls/cloud/blob-source-registry.ts b/packages/common/nbstore/src/impls/cloud/blob-source-registry.ts new file mode 100644 index 0000000000..61ec0b1aae --- /dev/null +++ b/packages/common/nbstore/src/impls/cloud/blob-source-registry.ts @@ -0,0 +1,104 @@ +import type { BlobSource, SourceBlobRecord } from '../../storage'; + +export interface BlobSourceCandidate { + context: 'owned' | 'workspace'; + source: BlobSource; + token: object; +} + +export class BlobSourceRegistry { + private readonly sourcesByKey = new Map< + string, + Map + >(); + private readonly ownedEntries = new Map< + string, + { source: BlobSource; entries: SourceBlobRecord[]; token: object } + >(); + private workspaceEntries: { + entry: SourceBlobRecord; + token: object; + }[] = []; + + sourceId(source: BlobSource) { + return source.type === 'currentDoc' + ? `currentDoc\0${source.workspaceId}\0${source.docId}` + : `history\0${source.workspaceId}\0${source.docId}\0${source.timestampMs}`; + } + + candidates(key: string) { + return [...(this.sourcesByKey.get(key)?.values() ?? [])]; + } + + hasCandidate(key: string, candidate: BlobSourceCandidate) { + const found = + this.sourcesByKey.get(key)?.get(this.candidateId(candidate))?.token === + candidate.token; + return found; + } + + replaceOwned(source: BlobSource, entries: SourceBlobRecord[], token: object) { + const id = this.sourceId(source); + this.ownedEntries.set(id, { source, entries, token }); + this.rebuild(); + } + + replaceWorkspace(entries: SourceBlobRecord[], token: object) { + this.workspaceEntries = entries.map(entry => ({ entry, token })); + this.rebuild(); + } + + removeKeyCandidate(key: string, candidate: BlobSourceCandidate) { + const id = this.sourceId(candidate.source); + if (candidate.context === 'workspace') { + this.workspaceEntries = this.workspaceEntries.filter( + workspace => + workspace.token !== candidate.token || + workspace.entry.key !== key || + this.sourceId(workspace.entry.source) !== id + ); + } else { + const owned = this.ownedEntries.get(id); + if (owned?.token === candidate.token) { + owned.entries = owned.entries.filter(entry => entry.key !== key); + } + } + this.rebuild(); + } + + removeOwned(source: BlobSource) { + const id = this.sourceId(source); + this.ownedEntries.delete(id); + this.rebuild(); + } + + private rebuild() { + this.sourcesByKey.clear(); + for (const workspace of this.workspaceEntries) { + this.merge(workspace.entry, 'workspace', workspace.token); + } + for (const registration of this.ownedEntries.values()) { + for (const entry of registration.entries) { + this.merge(entry, 'owned', registration.token); + } + } + } + + private merge( + entry: SourceBlobRecord, + context: BlobSourceCandidate['context'], + token: object + ) { + let sources = this.sourcesByKey.get(entry.key); + if (!sources) { + sources = new Map(); + this.sourcesByKey.set(entry.key, sources); + } + const candidate = { context, source: entry.source, token }; + sources.set(this.candidateId(candidate), candidate); + } + + private candidateId(candidate: BlobSourceCandidate) { + return `${candidate.context}\0${this.sourceId(candidate.source)}`; + } +} diff --git a/packages/common/nbstore/src/impls/cloud/blob-writer.ts b/packages/common/nbstore/src/impls/cloud/blob-writer.ts new file mode 100644 index 0000000000..fb2a03c0d5 --- /dev/null +++ b/packages/common/nbstore/src/impls/cloud/blob-writer.ts @@ -0,0 +1,325 @@ +import { UserFriendlyError } from '@affine/error'; +import { + abortBlobUploadMutation, + BlobUploadMethod, + completeBlobUploadMutation, + createBlobUploadMutation, + deleteBlobMutation, + getBlobUploadPartUrlQuery, + listBlobsQuery, + releaseDeletedBlobsMutation, + setBlobMutation, + workspaceBlobQuotaQuery, +} from '@affine/graphql'; + +import { + type BlobRecord, + OverCapacityError, + OverSizeError, +} from '../../storage'; +import type { HttpConnection } from './http'; + +const UPLOAD_REQUEST_TIMEOUT = 0; + +function toStrictArrayBuffer( + data: ArrayBuffer | ArrayBufferLike | ArrayBufferView +): ArrayBuffer { + if (data instanceof ArrayBuffer) { + return data; + } + + if (ArrayBuffer.isView(data)) { + if (data.buffer instanceof ArrayBuffer) { + if (data.byteOffset === 0 && data.byteLength === data.buffer.byteLength) { + return data.buffer; + } + return data.buffer.slice( + data.byteOffset, + data.byteOffset + data.byteLength + ); + } + + const bytes = new Uint8Array(data.buffer, data.byteOffset, data.byteLength); + const copy = new Uint8Array(bytes.byteLength); + copy.set(bytes); + return copy.buffer; + } + + const bytes = new Uint8Array(data); + const copy = new Uint8Array(bytes.byteLength); + copy.set(bytes); + return copy.buffer; +} + +export class CloudBlobWriter { + private humanReadableBlobSizeLimit: string | null = null; + private blobSizeLimit: number | null = null; + private blobSizeLimitTime = 0; + + constructor( + private readonly connection: HttpConnection, + private readonly workspaceId: string, + private readonly serverBaseUrl: string + ) {} + + async set(blob: BlobRecord, signal?: AbortSignal) { + try { + signal?.throwIfAborted(); + const blobSizeLimit = await this.getBlobSizeLimit(signal); + if (blob.data.byteLength > blobSizeLimit) { + throw new OverSizeError(this.humanReadableBlobSizeLimit); + } + + const init = await this.connection.gql({ + query: createBlobUploadMutation, + variables: { + workspaceId: this.workspaceId, + key: blob.key, + size: blob.data.byteLength, + mime: blob.mime, + }, + context: { signal }, + }); + + const upload = init.createBlobUpload; + if (upload.alreadyUploaded) { + return; + } + try { + if (upload.method === BlobUploadMethod.PRESIGNED) { + if (!upload.uploadUrl) { + throw new Error('Missing upload URL for presigned upload.'); + } + await this.uploadViaPresigned( + upload.uploadUrl, + upload.headers, + blob.data, + signal + ); + await this.completeUpload(blob.key, undefined, undefined, signal); + return; + } + + if (upload.method === BlobUploadMethod.MULTIPART) { + if (!upload.uploadId || !upload.partSize) { + throw new Error( + 'Missing upload ID or part size for multipart upload.' + ); + } + const parts = await this.uploadViaMultipart( + blob.key, + upload.uploadId, + upload.partSize, + blob.data, + upload.uploadedParts, + signal + ); + await this.completeUpload(blob.key, upload.uploadId, parts, signal); + return; + } + } catch (error) { + if (upload.method === BlobUploadMethod.MULTIPART && upload.uploadId) { + await this.tryAbortMultipartUpload(blob.key, upload.uploadId); + } + signal?.throwIfAborted(); + if (UserFriendlyError.fromAny(error).is('CONTENT_TOO_LARGE')) { + throw error; + } + } + + await this.uploadViaGraphql(blob, signal); + } catch (err) { + const userFriendlyError = UserFriendlyError.fromAny(err); + if (userFriendlyError.is('STORAGE_QUOTA_EXCEEDED')) { + throw new OverCapacityError(); + } + if (userFriendlyError.is('BLOB_QUOTA_EXCEEDED')) { + throw new OverSizeError(this.humanReadableBlobSizeLimit); + } + if (userFriendlyError.is('CONTENT_TOO_LARGE')) { + throw new OverSizeError( + null, + 'Upload stopped by network proxy: file size exceeds the set limit.' + ); + } + throw err; + } + } + + async delete(key: string, permanently: boolean) { + await this.connection.gql({ + query: deleteBlobMutation, + variables: { workspaceId: this.workspaceId, key, permanently }, + }); + } + + async release() { + await this.connection.gql({ + query: releaseDeletedBlobsMutation, + variables: { workspaceId: this.workspaceId }, + }); + } + + async listManageable() { + const result = await this.connection.gql({ + query: listBlobsQuery, + variables: { workspaceId: this.workspaceId }, + }); + return result.workspace.blobs.map(blob => ({ + ...blob, + createdAt: blob.createdAt ? new Date(blob.createdAt) : undefined, + })); + } + + private async uploadViaGraphql(blob: BlobRecord, signal?: AbortSignal) { + await this.connection.gql({ + query: setBlobMutation, + variables: { + workspaceId: this.workspaceId, + blob: new File([toStrictArrayBuffer(blob.data)], blob.key, { + type: blob.mime, + }), + }, + context: { signal }, + timeout: UPLOAD_REQUEST_TIMEOUT, + }); + } + + private async uploadViaPresigned( + uploadUrl: string, + headers: Record | null | undefined, + data: Uint8Array, + signal?: AbortSignal + ) { + const res = await this.fetchUpload(uploadUrl, { + method: 'PUT', + headers: headers ?? undefined, + body: toStrictArrayBuffer(data), + signal, + }); + if (!res.ok) { + throw new Error(`Presigned upload failed with status ${res.status}`); + } + } + + private async uploadViaMultipart( + key: string, + uploadId: string, + partSize: number, + data: Uint8Array, + uploadedParts: { partNumber: number; etag: string }[] | null | undefined, + signal?: AbortSignal + ) { + const partsMap = new Map(); + for (const part of uploadedParts ?? []) { + partsMap.set(part.partNumber, part.etag); + } + const totalParts = Math.ceil(data.byteLength / partSize); + + for (let partNumber = 1; partNumber <= totalParts; partNumber += 1) { + if (partsMap.has(partNumber)) { + continue; + } + const start = (partNumber - 1) * partSize; + const chunk = data.subarray( + start, + Math.min(start + partSize, data.byteLength) + ); + const part = await this.connection.gql({ + query: getBlobUploadPartUrlQuery, + variables: { + workspaceId: this.workspaceId, + key, + uploadId, + partNumber, + }, + context: { signal }, + }); + const res = await this.fetchUpload( + part.workspace.blobUploadPartUrl.uploadUrl, + { + method: 'PUT', + headers: part.workspace.blobUploadPartUrl.headers ?? undefined, + body: toStrictArrayBuffer(chunk), + signal, + } + ); + if (!res.ok) { + throw new Error( + `Multipart upload failed at part ${partNumber} with status ${res.status}` + ); + } + const etag = res.headers.get('etag'); + if (!etag) { + throw new Error(`Missing ETag for part ${partNumber}.`); + } + partsMap.set(partNumber, etag); + } + + if (partsMap.size !== totalParts) { + throw new Error('Multipart upload has missing parts.'); + } + return [...partsMap.entries()] + .sort((left, right) => left[0] - right[0]) + .map(([partNumber, etag]) => ({ partNumber, etag })); + } + + private async completeUpload( + key: string, + uploadId: string | undefined, + parts: { partNumber: number; etag: string }[] | undefined, + signal?: AbortSignal + ) { + await this.connection.gql({ + query: completeBlobUploadMutation, + variables: { workspaceId: this.workspaceId, key, uploadId, parts }, + context: { signal }, + timeout: UPLOAD_REQUEST_TIMEOUT, + }); + } + + private async tryAbortMultipartUpload(key: string, uploadId: string) { + try { + await this.connection.gql({ + query: abortBlobUploadMutation, + variables: { workspaceId: this.workspaceId, key, uploadId }, + }); + } catch {} + } + + private async fetchUpload(input: string, init: RequestInit) { + const res = await globalThis.fetch( + new URL(input, this.serverBaseUrl).toString(), + init + ); + if (res.status === 413) { + throw new UserFriendlyError({ + status: 413, + code: 'CONTENT_TOO_LARGE', + type: 'CONTENT_TOO_LARGE', + name: 'CONTENT_TOO_LARGE', + message: 'Content too large', + }); + } + return res; + } + + private async getBlobSizeLimit(signal?: AbortSignal) { + if ( + this.blobSizeLimit !== null && + Date.now() - this.blobSizeLimitTime < 120 * 1000 + ) { + return this.blobSizeLimit; + } + const res = await this.connection.gql({ + query: workspaceBlobQuotaQuery, + variables: { id: this.workspaceId }, + context: { signal }, + }); + this.humanReadableBlobSizeLimit = + res.workspace.quota.humanReadable.blobLimit; + this.blobSizeLimit = res.workspace.quota.blobLimit; + this.blobSizeLimitTime = Date.now(); + return this.blobSizeLimit; + } +} diff --git a/packages/common/nbstore/src/impls/cloud/blob.ts b/packages/common/nbstore/src/impls/cloud/blob.ts index d95318cf9a..6cfd5c0818 100644 --- a/packages/common/nbstore/src/impls/cloud/blob.ts +++ b/packages/common/nbstore/src/impls/cloud/blob.ts @@ -1,23 +1,16 @@ import { UserFriendlyError } from '@affine/error'; -import { - abortBlobUploadMutation, - BlobUploadMethod, - completeBlobUploadMutation, - createBlobUploadMutation, - deleteBlobMutation, - getBlobUploadPartUrlQuery, - listBlobsQuery, - releaseDeletedBlobsMutation, - setBlobMutation, - workspaceBlobQuotaQuery, -} from '@affine/graphql'; import { type BlobRecord, + type BlobSource, BlobStorageBase, - OverCapacityError, - OverSizeError, + type SourceBlobRecord, } from '../../storage'; +import { + type BlobSourceCandidate, + BlobSourceRegistry, +} from './blob-source-registry'; +import { CloudBlobWriter } from './blob-writer'; import { HttpConnection } from './http'; interface CloudBlobStorageOptions { @@ -25,38 +18,28 @@ interface CloudBlobStorageOptions { id: string; } -const SHOULD_MANUAL_REDIRECT = - BUILD_CONFIG.isAndroid || BUILD_CONFIG.isIOS || BUILD_CONFIG.isElectron; -const UPLOAD_REQUEST_TIMEOUT = 0; +type SourceRegistration = { + controller: AbortController; + dirty: boolean; + promise?: Promise; + source: BlobSource; +}; -function toStrictArrayBuffer( - data: ArrayBuffer | ArrayBufferLike | ArrayBufferView -): ArrayBuffer { - if (data instanceof ArrayBuffer) { - return data; +const MAX_PENDING_SOURCE_REGISTRATIONS = 32; + +export function sourceScopedBlobUrl( + workspaceId: string, + key: string, + source: BlobSource +) { + const query = new URLSearchParams({ + sourceType: source.type, + docId: source.docId, + }); + if (source.type === 'history') { + query.set('timestampMs', String(source.timestampMs)); } - - if (ArrayBuffer.isView(data)) { - if (data.buffer instanceof ArrayBuffer) { - if (data.byteOffset === 0 && data.byteLength === data.buffer.byteLength) { - return data.buffer; - } - return data.buffer.slice( - data.byteOffset, - data.byteOffset + data.byteLength - ); - } - - const bytes = new Uint8Array(data.buffer, data.byteOffset, data.byteLength); - const copy = new Uint8Array(bytes.byteLength); - copy.set(bytes); - return copy.buffer; - } - - const bytes = new Uint8Array(data); - const copy = new Uint8Array(bytes.byteLength); - copy.set(bytes); - return copy.buffer; + return `/api/workspaces/${encodeURIComponent(workspaceId)}/blobs/v1/${encodeURIComponent(key)}?${query}`; } export class CloudBlobStorage extends BlobStorageBase { @@ -68,367 +51,308 @@ export class CloudBlobStorage extends BlobStorageBase { } readonly connection = new HttpConnection(this.options.serverBaseUrl); + private readonly writer = new CloudBlobWriter( + this.connection, + this.options.id, + this.options.serverBaseUrl + ); - override async get(key: string, signal?: AbortSignal) { - const res = await this.connection.fetch( - '/api/workspaces/' + - this.options.id + - '/blobs/' + - key + - (SHOULD_MANUAL_REDIRECT ? '?redirect=manual' : ''), - { - cache: 'default', - headers: { - 'x-affine-version': BUILD_CONFIG.appVersion, - }, - signal, - } + private readonly sources = new BlobSourceRegistry(); + private readonly sourceRegistrations = new Map(); + private readonly pendingSourceRegistrations = new Set(); + + private sourceId(source: BlobSource) { + return this.sources.sourceId(source); + } + + private sourceQuery(source: BlobSource) { + const query = new URLSearchParams({ + sourceType: source.type, + docId: source.docId, + }); + if (source.type === 'history') { + query.set('timestampMs', String(source.timestampMs)); + } + return query; + } + + private removeKeyCandidate(key: string, candidate: BlobSourceCandidate) { + this.sources.removeKeyCandidate(key, candidate); + } + + private removeSource(source: BlobSource) { + this.sources.removeOwned(source); + } + + private replaceSource( + source: BlobSource, + entries: SourceBlobRecord[], + registration: SourceRegistration + ) { + this.sources.replaceOwned(source, entries, registration); + } + + private isRegistrationCurrent(registration: SourceRegistration) { + return ( + this.sourceRegistrations.get(this.sourceId(registration.source)) === + registration ); - - if (res.status === 404) { - return null; - } - - try { - const contentType = res.headers.get('content-type'); - - let blob; - - if ( - SHOULD_MANUAL_REDIRECT && - contentType?.startsWith('application/json') - ) { - const json = await res.json(); - if ('url' in json && typeof json.url === 'string') { - const res = await this.connection.fetch(json.url, { - cache: 'default', - headers: { - 'x-affine-version': BUILD_CONFIG.appVersion, - }, - signal, - }); - - blob = await res.blob(); - } else { - throw new Error('Invalid blob response'); - } - } else { - blob = await res.blob(); - } - - return { - key, - data: new Uint8Array(await blob.arrayBuffer()), - mime: blob.type, - size: blob.size, - createdAt: new Date(res.headers.get('last-modified') || Date.now()), - }; - } catch (err) { - throw new Error('blob download error: ' + err); - } } - override async set(blob: BlobRecord, signal?: AbortSignal) { - try { - const blobSizeLimit = await this.getBlobSizeLimit(); - if (blob.data.byteLength > blobSizeLimit) { - throw new OverSizeError(this.humanReadableBlobSizeLimitCache); - } - - const init = await this.connection.gql({ - query: createBlobUploadMutation, - variables: { - workspaceId: this.options.id, - key: blob.key, - size: blob.data.byteLength, - mime: blob.mime, - }, - context: { signal }, - }); - - const upload = init.createBlobUpload; - if (upload.alreadyUploaded) { - return; - } - if (upload.method === BlobUploadMethod.GRAPHQL) { - await this.uploadViaGraphql(blob, signal); - return; - } - - if (upload.method === BlobUploadMethod.PRESIGNED) { - try { - if (!upload.uploadUrl) { - throw new Error('Missing upload URL for presigned upload.'); - } - await this.uploadViaPresigned( - upload.uploadUrl, - upload.headers, - blob.data, - signal - ); - await this.completeUpload(blob.key, undefined, undefined, signal); - return; - } catch { - await this.uploadViaGraphql(blob, signal); - return; - } - } - - if (upload.method === BlobUploadMethod.MULTIPART) { - try { - if (!upload.uploadId || !upload.partSize) { - throw new Error( - 'Missing upload ID or part size for multipart upload.' - ); - } - const parts = await this.uploadViaMultipart( - blob.key, - upload.uploadId, - upload.partSize, - blob.data, - upload.uploadedParts, - signal - ); - await this.completeUpload(blob.key, upload.uploadId, parts, signal); - return; - } catch { - if (upload.uploadId) { - await this.tryAbortMultipartUpload( - blob.key, - upload.uploadId, - signal - ); - } - await this.uploadViaGraphql(blob, signal); - return; - } - } - - await this.uploadViaGraphql(blob, signal); - } catch (err) { - const userFriendlyError = UserFriendlyError.fromAny(err); - if (userFriendlyError.is('STORAGE_QUOTA_EXCEEDED')) { - throw new OverCapacityError(); - } - if (userFriendlyError.is('BLOB_QUOTA_EXCEEDED')) { - throw new OverSizeError(this.humanReadableBlobSizeLimitCache); - } - if (userFriendlyError.is('CONTENT_TOO_LARGE')) { - throw new OverSizeError( - null, - 'Upload stopped by network proxy: file size exceeds the set limit.' - ); - } - throw err; - } + private isCandidateCurrent(key: string, candidate: BlobSourceCandidate) { + return this.sources.hasCandidate(key, candidate); } - override async delete(key: string, permanently: boolean) { - await this.connection.gql({ - query: deleteBlobMutation, - variables: { workspaceId: this.options.id, key, permanently }, - }); - } - - override async release() { - await this.connection.gql({ - query: releaseDeletedBlobsMutation, - variables: { workspaceId: this.options.id }, - }); - } - - override async list() { - const res = await this.connection.gql({ - query: listBlobsQuery, - variables: { workspaceId: this.options.id }, - }); - - return res.workspace.blobs.map(blob => ({ - ...blob, - createdAt: new Date(blob.createdAt), - })); - } - - private async uploadViaGraphql(blob: BlobRecord, signal?: AbortSignal) { - await this.connection.gql({ - query: setBlobMutation, - variables: { - workspaceId: this.options.id, - blob: new File([toStrictArrayBuffer(blob.data)], blob.key, { - type: blob.mime, - }), - }, - context: { signal }, - timeout: UPLOAD_REQUEST_TIMEOUT, - }); - } - - private async uploadViaPresigned( - uploadUrl: string, - headers: Record | null | undefined, - data: Uint8Array, + async registerSource( + source: BlobSource, signal?: AbortSignal - ) { - const res = await this.fetchWithTimeout(uploadUrl, { - method: 'PUT', - headers: headers ?? undefined, - body: toStrictArrayBuffer(data), - signal, - timeout: UPLOAD_REQUEST_TIMEOUT, - }); - if (!res.ok) { - throw new Error(`Presigned upload failed with status ${res.status}`); + ): Promise { + const id = this.sourceId(source); + const existing = this.sourceRegistrations.get(id); + if (existing) { + return this.refreshSource(existing, signal); } - } - - private async uploadViaMultipart( - key: string, - uploadId: string, - partSize: number, - data: Uint8Array, - uploadedParts: { partNumber: number; etag: string }[] | null | undefined, - signal?: AbortSignal - ) { - const partsMap = new Map(); - for (const part of uploadedParts ?? []) { - partsMap.set(part.partNumber, part.etag); - } - const total = data.byteLength; - const totalParts = Math.ceil(total / partSize); - - for (let partNumber = 1; partNumber <= totalParts; partNumber += 1) { - if (partsMap.has(partNumber)) { - continue; - } - const start = (partNumber - 1) * partSize; - const end = Math.min(start + partSize, total); - const chunk = data.subarray(start, end); - - const part = await this.connection.gql({ - query: getBlobUploadPartUrlQuery, - variables: { workspaceId: this.options.id, key, uploadId, partNumber }, - context: { signal }, - }); - - const res = await this.fetchWithTimeout( - part.workspace.blobUploadPartUrl.uploadUrl, - { - method: 'PUT', - headers: part.workspace.blobUploadPartUrl.headers ?? undefined, - body: toStrictArrayBuffer(chunk), - signal, - timeout: UPLOAD_REQUEST_TIMEOUT, - } - ); - if (!res.ok) { - throw new Error( - `Multipart upload failed at part ${partNumber} with status ${res.status}` - ); - } - - const etag = res.headers.get('etag'); - if (!etag) { - throw new Error(`Missing ETag for part ${partNumber}.`); - } - partsMap.set(partNumber, etag); - } - - if (partsMap.size !== totalParts) { - throw new Error('Multipart upload has missing parts.'); - } - - return [...partsMap.entries()] - .sort((left, right) => left[0] - right[0]) - .map(([partNumber, etag]) => ({ partNumber, etag })); - } - - private async completeUpload( - key: string, - uploadId: string | undefined, - parts: { partNumber: number; etag: string }[] | undefined, - signal?: AbortSignal - ) { - await this.connection.gql({ - query: completeBlobUploadMutation, - variables: { workspaceId: this.options.id, key, uploadId, parts }, - context: { signal }, - timeout: UPLOAD_REQUEST_TIMEOUT, - }); - } - - private async tryAbortMultipartUpload( - key: string, - uploadId: string, - signal?: AbortSignal - ) { - try { - await this.connection.gql({ - query: abortBlobUploadMutation, - variables: { workspaceId: this.options.id, key, uploadId }, - context: { signal }, - }); - } catch {} - } - - private async fetchWithTimeout( - input: string, - init: RequestInit & { timeout?: number } - ) { - const externalSignal = init.signal; - if (externalSignal?.aborted) { - throw externalSignal.reason; - } - - const abortController = new AbortController(); - externalSignal?.addEventListener('abort', reason => { - abortController.abort(reason); - }); - - const timeout = init.timeout ?? 15000; - const timeoutId = - timeout > 0 - ? setTimeout(() => { - abortController.abort(new Error('request timeout')); - }, timeout) - : undefined; - - try { - const resolvedUrl = new URL(input, this.options.serverBaseUrl).toString(); - return await globalThis.fetch(resolvedUrl, { - ...init, - signal: abortController.signal, - }); - } finally { - if (timeoutId) { - clearTimeout(timeoutId); - } - } - } - - private humanReadableBlobSizeLimitCache: string | null = null; - private blobSizeLimitCache: number | null = null; - private blobSizeLimitCacheTime = 0; - private async getBlobSizeLimit() { - // If cache time is less than 120 seconds, return the cached value directly if ( - this.blobSizeLimitCache !== null && - Date.now() - this.blobSizeLimitCacheTime < 120 * 1000 + this.pendingSourceRegistrations.size >= MAX_PENDING_SOURCE_REGISTRATIONS ) { - return this.blobSizeLimitCache; + throw new Error('Blob source registration budget exceeded'); } - try { - const res = await this.connection.gql({ - query: workspaceBlobQuotaQuery, - variables: { id: this.options.id }, - }); + const registration = { + controller: new AbortController(), + dirty: false, + source, + } satisfies SourceRegistration; + this.sourceRegistrations.set(id, registration); + return this.refreshSource(registration, signal); + } - this.humanReadableBlobSizeLimitCache = - res.workspace.quota.humanReadable.blobLimit; - this.blobSizeLimitCache = res.workspace.quota.blobLimit; - this.blobSizeLimitCacheTime = Date.now(); - return this.blobSizeLimitCache; - } catch (err) { - throw UserFriendlyError.fromAny(err); + private refreshSource( + registration: SourceRegistration, + signal?: AbortSignal + ): Promise { + if (registration.promise) { + registration.dirty = true; + return registration.promise; } + if ( + this.pendingSourceRegistrations.size >= MAX_PENDING_SOURCE_REGISTRATIONS + ) { + throw new Error('Blob source registration budget exceeded'); + } + const registrationSignal = signal + ? AbortSignal.any([signal, registration.controller.signal]) + : registration.controller.signal; + registration.promise = this.loadSource( + registration.source, + registration, + registrationSignal + ).finally(() => { + this.pendingSourceRegistrations.delete(registration); + registration.promise = undefined; + }); + this.pendingSourceRegistrations.add(registration); + return registration.promise; + } + + async unregisterSource(source: BlobSource) { + const id = this.sourceId(source); + const registration = this.sourceRegistrations.get(id); + if (registration) { + this.sourceRegistrations.delete(id); + registration.controller.abort(); + } + this.removeSource(source); + await registration?.promise?.catch(() => {}); + } + + private async loadSource( + source: BlobSource, + registration: SourceRegistration, + signal?: AbortSignal + ) { + do { + registration.dirty = false; + try { + const res = await this.connection.fetch( + `/api/workspaces/${encodeURIComponent(this.options.id)}/blob-manifest/v1?${this.sourceQuery(source)}`, + { cache: 'no-store', signal } + ); + if (!res.ok) { + throw new Error( + `Blob source manifest failed with status ${res.status}` + ); + } + const manifest = (await res.json()) as { + version: 1; + entries: SourceBlobRecord[]; + }; + if (this.isRegistrationCurrent(registration)) { + this.replaceSource(source, manifest.entries, registration); + } + } catch (error) { + if (this.isRegistrationCurrent(registration)) { + this.removeSource(source); + } + throw error; + } + } while (registration.dirty && this.isRegistrationCurrent(registration)); + } + + async *readableSources(signal?: AbortSignal) { + let cursor: string | undefined; + try { + do { + const query = new URLSearchParams({ limit: '100' }); + if (cursor) query.set('cursor', cursor); + const res = await this.connection.fetch( + `/api/workspaces/${encodeURIComponent(this.options.id)}/readable-blob-manifest/v1?${query}`, + { cache: 'no-store', signal } + ); + if (!res.ok) { + throw new Error( + `Readable blob manifest failed with status ${res.status}` + ); + } + const manifest = (await res.json()) as { + version: 1; + entries: SourceBlobRecord[]; + nextCursor?: string; + }; + for (const entry of manifest.entries) { + this.sources.replaceWorkspace([entry], {}); + yield entry; + } + cursor = manifest.nextCursor; + } while (cursor); + } finally { + this.sources.replaceWorkspace([], {}); + } + } + + override async get(key: string, signal?: AbortSignal, source?: BlobSource) { + signal?.throwIfAborted(); + let candidates = this.sourceCandidates(key, source); + if (candidates.length === 0) { + const failed = await this.refreshRegisteredSources(source, signal); + signal?.throwIfAborted(); + candidates = this.sourceCandidates(key, source); + if (candidates.length === 0) { + if (failed) throw failed.reason; + return null; + } + } + + const attempt = async (candidates: BlobSourceCandidate[]) => { + for (const candidate of candidates) { + if (!this.isCandidateCurrent(key, candidate)) { + continue; + } + let res: Response; + try { + res = await this.connection.fetch( + sourceScopedBlobUrl(this.options.id, key, candidate.source), + { cache: 'no-store', signal } + ); + } catch (error) { + if ( + error instanceof UserFriendlyError && + (error.status === 403 || error.status === 404) + ) { + if (this.isCandidateCurrent(key, candidate)) { + this.removeKeyCandidate(key, candidate); + } + continue; + } + throw error; + } + if (!this.isCandidateCurrent(key, candidate)) { + continue; + } + if (res.status === 403 || res.status === 404) { + if (this.isCandidateCurrent(key, candidate)) { + this.removeKeyCandidate(key, candidate); + } + continue; + } + if (!res.ok) { + throw new Error(`Blob download failed with status ${res.status}`); + } + const blob = await res.blob(); + const data = new Uint8Array(await blob.arrayBuffer()); + if (!this.isCandidateCurrent(key, candidate)) { + continue; + } + return { + key, + data, + mime: blob.type, + size: blob.size, + createdAt: new Date(res.headers.get('last-modified') || Date.now()), + }; + } + return null; + }; + + return attempt(candidates); + } + + private sourceCandidates(key: string, source?: BlobSource) { + return this.sources + .candidates(key) + .filter( + candidate => + !source || this.sourceId(candidate.source) === this.sourceId(source) + ); + } + + private async refreshRegisteredSources( + source?: BlobSource, + signal?: AbortSignal + ) { + const registrations = source + ? [this.sourceRegistrations.get(this.sourceId(source))].filter( + (registration): registration is SourceRegistration => !!registration + ) + : [...this.sourceRegistrations.values()]; + if (registrations.length === 0) { + throw new Error('Blob source context is required'); + } + let failed: PromiseRejectedResult | undefined; + for ( + let offset = 0; + offset < registrations.length; + offset += MAX_PENDING_SOURCE_REGISTRATIONS + ) { + const results = await Promise.allSettled( + registrations + .slice(offset, offset + MAX_PENDING_SOURCE_REGISTRATIONS) + .map( + async registration => + registration.promise ?? this.refreshSource(registration, signal) + ) + ); + failed ??= results.find(result => result.status === 'rejected'); + } + return failed; + } + + override set(blob: BlobRecord, signal?: AbortSignal) { + return this.writer.set(blob, signal); + } + + override delete(key: string, permanently: boolean) { + return this.writer.delete(key, permanently); + } + + override release() { + return this.writer.release(); + } + + override async list(): Promise { + throw new Error('Workspace blob inventory is unavailable'); + } + + async listManageable() { + return this.writer.listManageable(); } } diff --git a/packages/common/nbstore/src/impls/cloud/doc.ts b/packages/common/nbstore/src/impls/cloud/doc.ts index 2e5dd4e913..4f30ae19d6 100644 --- a/packages/common/nbstore/src/impls/cloud/doc.ts +++ b/packages/common/nbstore/src/impls/cloud/doc.ts @@ -13,14 +13,13 @@ import { base64ToUint8Array, type ServerEventsMap, SocketConnection, - type SyncProtocol, + SPACE_JOIN_BATCH_LIMIT, uint8ArrayToBase64, } from './socket'; interface CloudDocStorageOptions extends DocStorageOptions { serverBaseUrl: string; isSelfHosted: boolean; - syncProtocol: SyncProtocol; type: SpaceType; } @@ -67,7 +66,6 @@ export class CloudDocStorage extends DocStorageBase { onServerInvalidation: ServerEventsMap['space:broadcast-doc-invalidation'] = message => { if ( - this.options.syncProtocol !== 'batch' || this.spaceType !== message.spaceType || this.spaceId !== message.spaceId ) { @@ -134,7 +132,9 @@ export class CloudDocStorage extends DocStorageBase { const response = await this.socket.emitWithAck('space:load-doc', { spaceType: this.spaceType, spaceId: this.spaceId, - docId: this.idConverter.newIdToOldId(docId), + docId: await this.connection.joinDoc( + this.idConverter.newIdToOldId(docId) + ), }); if ('error' in response) { @@ -156,7 +156,9 @@ export class CloudDocStorage extends DocStorageBase { const response = await this.socket.emitWithAck('space:load-doc', { spaceType: this.spaceType, spaceId: this.spaceId, - docId: this.idConverter.newIdToOldId(docId), + docId: await this.connection.joinDoc( + this.idConverter.newIdToOldId(docId) + ), stateVector: state ? await uint8ArrayToBase64(state) : void 0, }); @@ -180,7 +182,9 @@ export class CloudDocStorage extends DocStorageBase { const response = await this.socket.emitWithAck('space:push-doc-update', { spaceType: this.spaceType, spaceId: this.spaceId, - docId: this.idConverter.newIdToOldId(update.docId), + docId: await this.connection.joinDoc( + this.idConverter.newIdToOldId(update.docId) + ), update: await uint8ArrayToBase64(update.bin), }); @@ -202,7 +206,9 @@ export class CloudDocStorage extends DocStorageBase { const response = await this.socket.emitWithAck('space:load-doc', { spaceType: this.spaceType, spaceId: this.spaceId, - docId: this.idConverter.newIdToOldId(docId), + docId: await this.connection.joinDoc( + this.idConverter.newIdToOldId(docId) + ), }); if ('error' in response) { @@ -250,6 +256,25 @@ export class CloudDocStorage extends DocStorageBase { } } + async applyDocLifecycle( + docId: string, + lifecycle: 'trash' | 'restore' | 'delete' + ) { + const response = await this.socket.emitWithAck('space:doc-lifecycle', { + spaceType: this.spaceType, + spaceId: this.spaceId, + docId: this.idConverter.newIdToOldId(docId), + lifecycle, + }); + if ('error' in response) { + throw createWebsocketError(response.error); + } + return { + rootUpdate: base64ToUint8Array(response.data.rootUpdate), + timestamp: new Date(response.data.timestamp), + }; + } + protected async setDocSnapshot() { return false; } @@ -271,34 +296,26 @@ class CloudDocStorageConnection extends SocketConnection { } idConverter: IdConverter | null = null; + private readonly joinedDocIds = new Set(); + + async joinDoc(docId: string, socket: Socket = this.inner.socket) { + const res = await socket.emitWithAck('space:join-batch', { + spaces: [ + { spaceType: this.options.type, spaceId: this.options.id, docId }, + ], + clientVersion: BUILD_CONFIG.appVersion, + }); + if ('error' in res) throw createWebsocketError(res.error); + if (!res.data.success) throw new Error('Space join was rejected'); + this.joinedDocIds.add(docId); + return docId; + } override async doConnect(signal?: AbortSignal) { const { socket, disconnect } = await super.doConnect(signal); try { - const res = - this.options.syncProtocol === 'batch' - ? await socket.emitWithAck('space:join-batch', { - spaces: [ - { - spaceType: this.options.type, - spaceId: this.options.id, - }, - ], - clientVersion: BUILD_CONFIG.appVersion, - }) - : await socket.emitWithAck('space:join', { - spaceType: this.options.type, - spaceId: this.options.id, - clientVersion: BUILD_CONFIG.appVersion, - }); - - if ('error' in res) { - throw createWebsocketError(res.error); - } - if (!res.data.success) { - throw new Error('Space join was rejected'); - } + await this.joinDoc(this.options.id, socket); if (!this.idConverter) { this.idConverter = await this.getIdConverter(socket); @@ -309,7 +326,7 @@ class CloudDocStorageConnection extends SocketConnection { return { socket, disconnect }; } catch (e) { - disconnect(); + this.doDisconnect({ socket, disconnect }); throw e; } } @@ -321,18 +338,24 @@ class CloudDocStorageConnection extends SocketConnection { socket: Socket; disconnect: () => void; }) { - if (this.options.syncProtocol === 'batch') { + const docIds = [...this.joinedDocIds]; + this.joinedDocIds.clear(); + for ( + let offset = 0; + offset < docIds.length; + offset += SPACE_JOIN_BATCH_LIMIT + ) { socket.emit('space:leave-batch', { spaceType: this.options.type, spaceId: this.options.id, - docIds: [], - }); - } else { - socket.emit('space:leave', { - spaceType: this.options.type, - spaceId: this.options.id, + docIds: docIds.slice(offset, offset + SPACE_JOIN_BATCH_LIMIT), }); } + socket.emit('space:leave-batch', { + spaceType: this.options.type, + spaceId: this.options.id, + docIds: [], + }); socket.off('space:broadcast-doc-updates', this.onServerUpdates); socket.off('space:broadcast-doc-invalidation', this.onServerInvalidation); super.doDisconnect({ socket, disconnect }); diff --git a/packages/common/nbstore/src/impls/cloud/http.ts b/packages/common/nbstore/src/impls/cloud/http.ts index acdcd27c10..2dd7179770 100644 --- a/packages/common/nbstore/src/impls/cloud/http.ts +++ b/packages/common/nbstore/src/impls/cloud/http.ts @@ -14,9 +14,9 @@ export class HttpConnection extends DummyConnection { } const abortController = new AbortController(); - externalSignal?.addEventListener('abort', reason => { - abortController.abort(reason); - }); + const signal = externalSignal + ? AbortSignal.any([externalSignal, abortController.signal]) + : abortController.signal; const timeout = init?.timeout ?? 15000; const timeoutId = @@ -26,47 +26,49 @@ export class HttpConnection extends DummyConnection { }, timeout) : undefined; - const res = await globalThis - .fetch(new URL(input, this.serverBaseUrl), { - ...init, - signal: abortController.signal, - headers: { - ...this.requestHeaders, - ...init?.headers, - 'x-affine-version': BUILD_CONFIG.appVersion, - }, - }) - .catch(err => { - throw new UserFriendlyError({ - status: 504, - code: 'NETWORK_ERROR', - type: 'NETWORK_ERROR', - name: 'NETWORK_ERROR', - message: `Network error: ${err.message}`, - stacktrace: err.stack, + try { + const res = await globalThis + .fetch(new URL(input, this.serverBaseUrl), { + ...init, + signal, + headers: { + ...this.requestHeaders, + ...init?.headers, + 'x-affine-version': BUILD_CONFIG.appVersion, + }, + }) + .catch(err => { + externalSignal?.throwIfAborted(); + throw new UserFriendlyError({ + status: 504, + code: 'NETWORK_ERROR', + type: 'NETWORK_ERROR', + name: 'NETWORK_ERROR', + message: `Network error: ${err.message}`, + stacktrace: err.stack, + }); }); - }); - if (timeoutId) { - clearTimeout(timeoutId); - } - if (!res.ok && res.status !== 404) { - if (res.status === 413) { - throw new UserFriendlyError({ - status: 413, - code: 'CONTENT_TOO_LARGE', - type: 'CONTENT_TOO_LARGE', - name: 'CONTENT_TOO_LARGE', - message: 'Content too large', - }); - } else if ( - res.headers.get('Content-Type')?.startsWith('application/json') - ) { - throw UserFriendlyError.fromAny(await res.json()); - } else { - throw UserFriendlyError.fromAny(await res.text()); + if (!res.ok && res.status !== 404) { + if (res.status === 413) { + throw new UserFriendlyError({ + status: 413, + code: 'CONTENT_TOO_LARGE', + type: 'CONTENT_TOO_LARGE', + name: 'CONTENT_TOO_LARGE', + message: 'Content too large', + }); + } else if ( + res.headers.get('Content-Type')?.startsWith('application/json') + ) { + throw UserFriendlyError.fromAny(await res.json()); + } else { + throw UserFriendlyError.fromAny(await res.text()); + } } + return res; + } finally { + if (timeoutId) clearTimeout(timeoutId); } - return res; }; readonly fetchArrayBuffer = async (input: string, init?: RequestInit) => { diff --git a/packages/common/nbstore/src/impls/cloud/socket.ts b/packages/common/nbstore/src/impls/cloud/socket.ts index 5e61024e89..b82d528d8c 100644 --- a/packages/common/nbstore/src/impls/cloud/socket.ts +++ b/packages/common/nbstore/src/impls/cloud/socket.ts @@ -59,13 +59,7 @@ interface ServerEvents { 'realtime:event': RealtimeEvent; } -export type SyncProtocol = 'legacy' | 'batch'; - interface ClientEvents { - 'space:join': [ - { spaceType: string; spaceId: string; clientVersion: string }, - { clientId: string; success: boolean }, - ]; 'space:join-batch': [ { spaces: Array<{ @@ -82,22 +76,6 @@ interface ClientEvents { spaceId: string; docIds: string[]; }; - 'space:leave': { spaceType: string; spaceId: string }; - 'space:join-awareness': [ - { - spaceType: string; - spaceId: string; - docId: string; - clientVersion: string; - }, - { clientId: string; success: boolean }, - ]; - 'space:leave-awareness': { - spaceType: string; - spaceId: string; - docId: string; - }; - 'space:update-awareness': { spaceType: string; spaceId: string; @@ -140,6 +118,15 @@ interface ClientEvents { { spaceType: string; spaceId: string; docId: string }, { success?: true }, ]; + 'space:doc-lifecycle': [ + { + spaceType: string; + spaceId: string; + docId: string; + lifecycle: 'trash' | 'restore' | 'delete'; + }, + { rootUpdate: string; timestamp: number }, + ]; 'telemetry:batch': [TelemetryBatch, TelemetryAck]; diff --git a/packages/common/nbstore/src/storage/blob.ts b/packages/common/nbstore/src/storage/blob.ts index 4b53874179..e6301d4f19 100644 --- a/packages/common/nbstore/src/storage/blob.ts +++ b/packages/common/nbstore/src/storage/blob.ts @@ -15,10 +15,39 @@ export interface ListedBlobRecord { createdAt?: Date; } +export type BlobSource = + | { type: 'currentDoc'; workspaceId: string; docId: string } + | { + type: 'history'; + workspaceId: string; + docId: string; + timestampMs: number; + }; + +export interface SourceBlobRecord extends ListedBlobRecord { + source: BlobSource; +} + +export interface SourceScopedBlobStorage { + registerSource(source: BlobSource, signal?: AbortSignal): Promise; + unregisterSource(source: BlobSource): Promise; + readableSources(signal?: AbortSignal): AsyncIterable; +} + +export function isSourceScopedBlobStorage( + storage: BlobStorage +): storage is BlobStorage & SourceScopedBlobStorage { + return 'registerSource' in storage && 'readableSources' in storage; +} + export interface BlobStorage extends Storage { readonly storageType: 'blob'; readonly isReadonly: boolean; - get(key: string, signal?: AbortSignal): Promise; + get( + key: string, + signal?: AbortSignal, + source?: BlobSource + ): Promise; set(blob: BlobRecord, signal?: AbortSignal): Promise; delete( key: string, @@ -33,7 +62,11 @@ export abstract class BlobStorageBase implements BlobStorage { readonly storageType = 'blob'; abstract readonly connection: Connection; abstract readonly isReadonly: boolean; - abstract get(key: string, signal?: AbortSignal): Promise; + abstract get( + key: string, + signal?: AbortSignal, + source?: BlobSource + ): Promise; abstract set(blob: BlobRecord, signal?: AbortSignal): Promise; abstract delete( key: string, diff --git a/packages/common/nbstore/src/storage/doc.ts b/packages/common/nbstore/src/storage/doc.ts index 9c0d37f483..bce26c7844 100644 --- a/packages/common/nbstore/src/storage/doc.ts +++ b/packages/common/nbstore/src/storage/doc.ts @@ -47,6 +47,13 @@ export interface DocUpdate { editor?: string; } +export type DocLifecycle = 'trash' | 'restore' | 'delete'; + +export interface DocLifecycleResult { + rootUpdate: Uint8Array; + timestamp: Date; +} + export interface Editor { name: string; avatarUrl: string | null; @@ -96,6 +103,11 @@ export interface DocStorage extends Storage { */ deleteDoc(docId: string): Promise; + applyDocLifecycle?( + docId: string, + lifecycle: DocLifecycle + ): Promise; + /** * Subscribe on doc updates emitted from storage itself. * diff --git a/packages/common/nbstore/src/sync/blob/index.ts b/packages/common/nbstore/src/sync/blob/index.ts index 1464e4f6f8..dc66843b62 100644 --- a/packages/common/nbstore/src/sync/blob/index.ts +++ b/packages/common/nbstore/src/sync/blob/index.ts @@ -7,7 +7,12 @@ import { throttleTime, } from 'rxjs'; -import type { BlobRecord, BlobStorage, BlobSyncStorage } from '../../storage'; +import type { + BlobRecord, + BlobSource, + BlobStorage, + BlobSyncStorage, +} from '../../storage'; import type { PeerStorageOptions } from '../types'; import { BlobSyncPeer } from './peer'; @@ -38,6 +43,8 @@ export interface BlobSync { * @throws This method will throw an error if the download is aborted or fails due to network issues. */ downloadBlob(blobId: string): Promise; + registerSource(source: BlobSource): Promise; + unregisterSource(source: BlobSource): Promise; /** * Upload a blob to all peers * @param blob - The blob to upload @@ -159,6 +166,18 @@ export class BlobSyncImpl implements BlobSync { }); } + async registerSource(source: BlobSource): Promise { + await Promise.all( + this.peers.map(peer => + peer.registerSource(source, this.abortController.signal) + ) + ); + } + + async unregisterSource(source: BlobSource): Promise { + await Promise.all(this.peers.map(peer => peer.unregisterSource(source))); + } + uploadBlob(blob: BlobRecord, force = false): Promise { return Promise.all( this.peers.map(p => diff --git a/packages/common/nbstore/src/sync/blob/peer.ts b/packages/common/nbstore/src/sync/blob/peer.ts index c628f01f29..af3f1b3da9 100644 --- a/packages/common/nbstore/src/sync/blob/peer.ts +++ b/packages/common/nbstore/src/sync/blob/peer.ts @@ -1,8 +1,11 @@ -import { difference } from 'lodash-es'; import { filter, Observable, ReplaySubject, share, Subject } from 'rxjs'; -import type { BlobRecord, BlobStorage } from '../../storage'; -import { OverCapacityError, OverSizeError } from '../../storage'; +import type { BlobRecord, BlobSource, BlobStorage } from '../../storage'; +import { + isSourceScopedBlobStorage, + OverCapacityError, + OverSizeError, +} from '../../storage'; import type { BlobSyncStorage } from '../../storage/blob-sync'; import { MANUALLY_STOP, throwIfAborted } from '../../utils/throw-if-aborted'; @@ -40,6 +43,42 @@ export class BlobSyncPeer { readonly blobSync: BlobSyncStorage ) {} + async registerSource(source: BlobSource, signal?: AbortSignal) { + if (isSourceScopedBlobStorage(this.remote)) { + const statusId = this.sourceStatusId(source); + try { + await this.remote.registerSource(source, signal); + this.status.blobErrorFree(statusId); + } catch (error) { + this.status.blobError( + statusId, + error instanceof Error ? error.message : String(error) + ); + throw error; + } + } + } + + async unregisterSource(source: BlobSource) { + if (isSourceScopedBlobStorage(this.remote)) { + const statusId = this.sourceStatusId(source); + try { + await this.remote.unregisterSource(source); + this.status.blobErrorFree(statusId); + } catch (error) { + this.status.blobError( + statusId, + error instanceof Error ? error.message : String(error) + ); + throw error; + } + } + } + + private sourceStatusId(source: BlobSource) { + return `source:${source.type}:${source.workspaceId}:${source.docId}:${source.type === 'history' ? source.timestampMs : ''}`; + } + private readonly downloadingPromise = new Map>(); /** @@ -50,9 +89,16 @@ export class BlobSyncPeer { * * @throws This method will throw an error if the download operation fails due to network issues or is aborted */ - downloadBlob(blobId: string, signal?: AbortSignal): Promise { + downloadBlob( + blobId: string, + signal?: AbortSignal, + source?: BlobSource + ): Promise { + const downloadId = source + ? `${blobId}\0${source.type}\0${source.workspaceId}\0${source.docId}\0${source.type === 'history' ? source.timestampMs : ''}` + : blobId; // if the blob is already downloading, return the existing promise - const existing = this.downloadingPromise.get(blobId); + const existing = this.downloadingPromise.get(downloadId); if (existing) { return existing; } @@ -73,7 +119,7 @@ export class BlobSyncPeer { const attempt = async () => { try { throwIfAborted(signal); - const data = await this.remote.get(blobId, signal); + const data = await this.remote.get(blobId, signal, source); throwIfAborted(signal); if (data) { // mark the blob as uploaded to avoid uploading the same blob again @@ -122,10 +168,10 @@ export class BlobSyncPeer { }) .finally(() => { this.status.blobDownloadFinish(blobId); - this.downloadingPromise.delete(blobId); + this.downloadingPromise.delete(downloadId); }); - this.downloadingPromise.set(blobId, promise); + this.downloadingPromise.set(downloadId, promise); return promise; } @@ -274,57 +320,18 @@ export class BlobSyncPeer { } try { - if (needUpload.length <= 3) { - // if there is only few blobs to upload, upload them one by one - - // upload the blobs - for (const blobKey of needUpload) { - const data = await this.local.get(blobKey); - throwIfAborted(signal); - if (data) { - try { - await this.uploadBlob(data, false, signal); - } catch (err) { - if (err === MANUALLY_STOP) { - throw err; - } - // ignore the error as it has already been recorded in the sync status - } - } + for (const blobKey of needUpload) { + if (this.status.overSize.has(blobKey)) { + continue; } - } else { - // if there are many blobs to upload, call remote list to reduce unnecessary uploads - const remoteList = new Set((await this.remote.list()).map(b => b.key)); - - for (const blobKey of needUpload) { - if (remoteList.has(blobKey)) { - // if the blob is already uploaded, set the blob as uploaded - await this.blobSync.setBlobUploadedAt( - this.peerId, - blobKey, - new Date() - ); - - // mark the blob as uploaded - this.status.blobUploadFinish(blobKey); - continue; - } - - // if the blob is over size, skip it - if (this.status.overSize.has(blobKey)) { - continue; - } - - const data = await this.local.get(blobKey); - throwIfAborted(signal); - if (data) { - try { - await this.uploadBlob(data, false, signal); - } catch (err) { - if (err === MANUALLY_STOP) { - throw err; - } - // ignore the error as it has already been recorded in the sync status + const data = await this.local.get(blobKey); + throwIfAborted(signal); + if (data) { + try { + await this.uploadBlob(data, false, signal); + } catch (err) { + if (err === MANUALLY_STOP) { + throw err; } } } @@ -341,35 +348,48 @@ export class BlobSyncPeer { await this.local.connection.waitForConnected(signal); await this.remote.connection.waitForConnected(signal); - const localList = (await this.local.list()).map(b => b.key); - const remoteList = (await this.remote.list()).map(b => b.key); - - const needDownload = difference(remoteList, localList); - - // mark all blobs as will download - for (const blobKey of needDownload) { - this.status.markBlobToDownload(blobKey); - this.status.blobWillDownload(blobKey); + const localKeys = new Set( + (await this.local.list(signal)).map(blob => blob.key) + ); + if (isSourceScopedBlobStorage(this.remote)) { + for await (const entry of this.remote.readableSources(signal)) { + await this.downloadMissingBlob( + entry.key, + localKeys, + signal, + entry.source + ); + } + } else { + for (const entry of await this.remote.list(signal)) { + await this.downloadMissingBlob(entry.key, localKeys, signal); + } } + } + private async downloadMissingBlob( + blobKey: string, + localKeys: Set, + signal?: AbortSignal, + source?: BlobSource + ) { + if (localKeys.has(blobKey)) return; + this.status.markBlobToDownload(blobKey); + this.status.blobWillDownload(blobKey); try { - for (const blobKey of needDownload) { - throwIfAborted(signal); - // download the blobs - try { - await this.downloadBlob(blobKey, signal); - } catch (err) { - if (err === MANUALLY_STOP) { - throw err; - } - // ignore the error as it has already been recorded in the sync status + throwIfAborted(signal); + try { + if (await this.downloadBlob(blobKey, signal, source)) { + localKeys.add(blobKey); } + } catch (err) { + if (err === MANUALLY_STOP) { + throw err; + } + // ignore the error as it has already been recorded in the sync status } } finally { - // remove all will download flags - for (const blobKey of needDownload) { - this.status.blobWillDownloadFinish(blobKey); - } + this.status.blobWillDownloadFinish(blobKey); } } diff --git a/packages/common/nbstore/src/sync/doc/peer.ts b/packages/common/nbstore/src/sync/doc/peer.ts index e5e3bb3ca6..e59e053ada 100644 --- a/packages/common/nbstore/src/sync/doc/peer.ts +++ b/packages/common/nbstore/src/sync/doc/peer.ts @@ -247,7 +247,10 @@ export class DocSyncPeer { !docErrorMessage && (!this.status.connectedDocs.has(docId) || this.status.jobMap.has(docId)), - synced: !docErrorMessage && !this.status.jobMap.has(docId), + synced: + !docErrorMessage && + this.status.connectedDocs.has(docId) && + !this.status.jobMap.has(docId), retrying: this.status.retrying, errorMessage: docErrorMessage ?? this.status.errorMessage, }); @@ -886,7 +889,7 @@ export class DocSyncPeer { return; } - const priority = this.prioritySettings.get(job.docId) ?? 0; + const priority = this.getJobPriority(job.docId); this.status.jobDocQueue.push(job.docId, priority); const existingJobs = this.status.jobMap.get(job.docId) ?? []; @@ -895,11 +898,18 @@ export class DocSyncPeer { this.statusUpdatedSubject$.next(job.docId); } + private getJobPriority(docId: string) { + // New document uploads require their root membership to be synced first. + return docId === this.local.spaceId + ? Infinity + : (this.prioritySettings.get(docId) ?? 0); + } + addPriority(id: string, priority: number) { const oldPriority = this.prioritySettings.get(id) ?? 0; const newPriority = oldPriority + priority; this.prioritySettings.set(id, newPriority); - this.status.jobDocQueue.setPriority(id, newPriority); + this.status.jobDocQueue.setPriority(id, this.getJobPriority(id)); if (oldPriority <= 0 && newPriority > 0 && this.status.syncing) { if (!this.status.docs.has(id)) { this.actions.addDoc(id); @@ -912,7 +922,7 @@ export class DocSyncPeer { const currentPriority = this.prioritySettings.get(id) ?? 0; const restoredPriority = currentPriority - priority; this.prioritySettings.set(id, restoredPriority); - this.status.jobDocQueue.setPriority(id, restoredPriority); + this.status.jobDocQueue.setPriority(id, this.getJobPriority(id)); }; } diff --git a/packages/common/nbstore/src/worker/client.ts b/packages/common/nbstore/src/worker/client.ts index 14c300cacd..96850fa074 100644 --- a/packages/common/nbstore/src/worker/client.ts +++ b/packages/common/nbstore/src/worker/client.ts @@ -25,7 +25,10 @@ import { type AggregateResult, type AwarenessRecord, type BlobRecord, + type BlobSource, type BlobStorage, + type DocLifecycle, + type DocLifecycleResult, type DocRecord, type DocStorage, type DocUpdate, @@ -303,6 +306,16 @@ class WorkerDocStorage implements DocStorage { return this.client.call('docStorage.deleteDoc', docId); } + async applyDocLifecycle( + docId: string, + lifecycle: DocLifecycle + ): Promise { + return this.client.call('docStorage.applyDocLifecycle', { + docId, + lifecycle, + }); + } + subscribeDocUpdate(callback: (update: DocRecord, origin?: string) => void) { const subscription = this.client .ob$('docStorage.subscribeDocUpdate') @@ -422,6 +435,12 @@ class WorkerBlobSync implements BlobSync { downloadBlob(blobId: string): Promise { return this.client.call('blobSync.downloadBlob', blobId); } + registerSource(source: BlobSource): Promise { + return this.client.call('blobSync.registerSource', source); + } + unregisterSource(source: BlobSource): Promise { + return this.client.call('blobSync.unregisterSource', source); + } uploadBlob(blob: BlobRecord, force?: boolean): Promise { return this.client.call('blobSync.uploadBlob', { blob, force }); } diff --git a/packages/common/nbstore/src/worker/consumer.ts b/packages/common/nbstore/src/worker/consumer.ts index f98bf9cd16..7b839317bf 100644 --- a/packages/common/nbstore/src/worker/consumer.ts +++ b/packages/common/nbstore/src/worker/consumer.ts @@ -193,6 +193,15 @@ class StoreConsumer { this.docStorage.getDocTimestamp(docId), 'docStorage.deleteDoc': (docId: string) => this.docStorage.deleteDoc(docId), + 'docStorage.applyDocLifecycle': async ({ docId, lifecycle }) => { + const remote = Object.values(this.storages.remotes) + .map(storage => storage.get('doc')) + .find(storage => storage.applyDocLifecycle); + if (!remote?.applyDocLifecycle) { + throw new Error('Document lifecycle is unavailable'); + } + return await remote.applyDocLifecycle(docId, lifecycle); + }, 'docStorage.subscribeDocUpdate': () => new Observable(subscriber => { return this.docStorage.subscribeDocUpdate((update, origin) => { @@ -259,6 +268,9 @@ class StoreConsumer { 'blobSync.state': () => this.blobSync.state$, 'blobSync.blobState': blobId => this.blobSync.blobState$(blobId), 'blobSync.downloadBlob': key => this.blobSync.downloadBlob(key), + 'blobSync.registerSource': source => this.blobSync.registerSource(source), + 'blobSync.unregisterSource': source => + this.blobSync.unregisterSource(source), 'blobSync.uploadBlob': ({ blob, force }) => this.blobSync.uploadBlob(blob, force), 'blobSync.fullDownload': peerId => diff --git a/packages/common/nbstore/src/worker/ops.ts b/packages/common/nbstore/src/worker/ops.ts index 3fca67479e..b61f2546a1 100644 --- a/packages/common/nbstore/src/worker/ops.ts +++ b/packages/common/nbstore/src/worker/ops.ts @@ -14,9 +14,12 @@ import type { AvailableStorageImplementations } from '../impls'; import type { AggregateResult, BlobRecord, + BlobSource, DocClock, DocClocks, DocDiff, + DocLifecycle, + DocLifecycleResult, DocRecord, DocUpdate, ListedBlobRecord, @@ -55,6 +58,10 @@ interface GroupedWorkerOps { getDocTimestamps: [Date | null, DocClocks]; getDocTimestamp: [string, DocClock | null]; deleteDoc: [string, void]; + applyDocLifecycle: [ + { docId: string; lifecycle: DocLifecycle }, + DocLifecycleResult, + ]; subscribeDocUpdate: [void, { update: DocRecord; origin?: string }]; waitForConnected: [void, void]; }; @@ -97,6 +104,8 @@ interface GroupedWorkerOps { state: [void, BlobSyncState]; blobState: [string, BlobSyncBlobState]; downloadBlob: [string, boolean]; + registerSource: [BlobSource, void]; + unregisterSource: [BlobSource, void]; uploadBlob: [{ blob: BlobRecord; force?: boolean }, true]; fullDownload: [string | null, void]; }; diff --git a/packages/common/reader/package.json b/packages/common/reader/package.json index 7a828c4a13..8869b009a0 100644 --- a/packages/common/reader/package.json +++ b/packages/common/reader/package.json @@ -1,7 +1,7 @@ { "name": "@affine/reader", "type": "module", - "version": "0.27.0", + "version": "0.27.5", "private": true, "sideEffects": false, "module": "./src/index.ts", diff --git a/packages/common/realtime/package.json b/packages/common/realtime/package.json index 0e133f071a..aa7ac7737b 100644 --- a/packages/common/realtime/package.json +++ b/packages/common/realtime/package.json @@ -1,7 +1,7 @@ { "name": "@affine/realtime", "type": "module", - "version": "0.27.0", + "version": "0.27.5", "private": true, "sideEffects": false, "exports": { diff --git a/packages/common/s3-compat/package.json b/packages/common/s3-compat/package.json index 93df7fbf23..a2b35130a4 100644 --- a/packages/common/s3-compat/package.json +++ b/packages/common/s3-compat/package.json @@ -13,5 +13,5 @@ "devDependencies": { "@types/aws4": "^1.11.6" }, - "version": "0.27.0" + "version": "0.27.5" } diff --git a/packages/frontend/admin/package.json b/packages/frontend/admin/package.json index 19c128bcfa..1d109926fa 100644 --- a/packages/frontend/admin/package.json +++ b/packages/frontend/admin/package.json @@ -1,6 +1,6 @@ { "name": "@affine/admin", - "version": "0.27.0", + "version": "0.27.5", "private": true, "dependencies": { "@affine/component": "workspace:*", diff --git a/packages/frontend/apps/android/package.json b/packages/frontend/apps/android/package.json index c387ee87d5..e0a1ccdd8d 100644 --- a/packages/frontend/apps/android/package.json +++ b/packages/frontend/apps/android/package.json @@ -1,6 +1,6 @@ { "name": "@affine/android", - "version": "0.27.0", + "version": "0.27.5", "description": "AFFiNE Desktop Web application", "private": true, "scripts": { diff --git a/packages/frontend/apps/electron-renderer/package.json b/packages/frontend/apps/electron-renderer/package.json index 390a44d960..90c1b17495 100644 --- a/packages/frontend/apps/electron-renderer/package.json +++ b/packages/frontend/apps/electron-renderer/package.json @@ -1,7 +1,7 @@ { "name": "@affine/electron-renderer", "private": true, - "version": "0.27.0", + "version": "0.27.5", "type": "module", "scripts": { "build": "affine bundle", diff --git a/packages/frontend/apps/electron/package.json b/packages/frontend/apps/electron/package.json index 9c1e5f898f..310d4b76cb 100644 --- a/packages/frontend/apps/electron/package.json +++ b/packages/frontend/apps/electron/package.json @@ -1,7 +1,7 @@ { "name": "@affine/electron", "private": true, - "version": "0.27.0", + "version": "0.27.5", "main": "./dist/main.js", "author": "toeverything", "repository": { diff --git a/packages/frontend/apps/electron/resources/affine.metainfo.xml b/packages/frontend/apps/electron/resources/affine.metainfo.xml index 915dbbe80c..a688739e4b 100644 --- a/packages/frontend/apps/electron/resources/affine.metainfo.xml +++ b/packages/frontend/apps/electron/resources/affine.metainfo.xml @@ -64,8 +64,8 @@ - - https://github.com/toeverything/AFFiNE/releases/tag/v0.27.0 + + https://github.com/toeverything/AFFiNE/releases/tag/v0.27.5 diff --git a/packages/frontend/apps/electron/src/main/protocol.ts b/packages/frontend/apps/electron/src/main/protocol.ts index 4c993bee2c..3ced9bb43e 100644 --- a/packages/frontend/apps/electron/src/main/protocol.ts +++ b/packages/frontend/apps/electron/src/main/protocol.ts @@ -203,7 +203,7 @@ function allowCors( headers: Record, origin: string = 'assets://.' ) { - // Signed blob URLs redirect to *.usercontent.affine.pro without CORS headers. + // Object-storage upload and Copilot URLs do not include application CORS headers. setHeader(headers, 'Access-Control-Allow-Origin', origin); setHeader(headers, 'Access-Control-Allow-Credentials', 'true'); setHeader(headers, 'Access-Control-Allow-Methods', 'GET, HEAD, PUT, OPTIONS'); @@ -228,7 +228,7 @@ export async function registerProtocol() { if (responseHeaders) { const { protocol, hostname } = new URL(url); - // Adjust CORS for assets responses and allow blob redirects on affine domains + // Adjust CORS for local assets and application-owned object storage. if (protocol === 'assets:') { delete responseHeaders['access-control-allow-origin']; delete responseHeaders['access-control-allow-headers']; diff --git a/packages/frontend/apps/ios/App/App.xcodeproj/project.pbxproj b/packages/frontend/apps/ios/App/App.xcodeproj/project.pbxproj index 93782c3e44..596a16f3a8 100644 --- a/packages/frontend/apps/ios/App/App.xcodeproj/project.pbxproj +++ b/packages/frontend/apps/ios/App/App.xcodeproj/project.pbxproj @@ -815,7 +815,7 @@ "$(inherited)", "$(PROJECT_DIR)", ); - MARKETING_VERSION = 2026.7.14; + MARKETING_VERSION = 2026.9.9; OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\""; PRODUCT_BUNDLE_IDENTIFIER = app.affine.pro; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -852,7 +852,7 @@ "$(inherited)", "$(PROJECT_DIR)", ); - MARKETING_VERSION = 2026.7.14; + MARKETING_VERSION = 2026.9.9; ONLY_ACTIVE_ARCH = NO; PRODUCT_BUNDLE_IDENTIFIER = app.affine.pro; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -885,7 +885,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 2026.7.14; + MARKETING_VERSION = 2026.9.9; PRODUCT_BUNDLE_IDENTIFIER = app.affine.pro.ShareExtension; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -913,7 +913,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 2026.7.14; + MARKETING_VERSION = 2026.9.9; PRODUCT_BUNDLE_IDENTIFIER = app.affine.pro.ShareExtension; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; diff --git a/packages/frontend/apps/ios/App/Packages/Intelligents/Sources/Intelligents/IntelligentContext/QLService+CopilotBlobUpload.swift b/packages/frontend/apps/ios/App/Packages/Intelligents/Sources/Intelligents/IntelligentContext/QLService+CopilotBlobUpload.swift index 10f8942533..ae77327799 100644 --- a/packages/frontend/apps/ios/App/Packages/Intelligents/Sources/Intelligents/IntelligentContext/QLService+CopilotBlobUpload.swift +++ b/packages/frontend/apps/ios/App/Packages/Intelligents/Sources/Intelligents/IntelligentContext/QLService+CopilotBlobUpload.swift @@ -3,308 +3,137 @@ import CryptoKit import Foundation struct CopilotAttachmentUpload { - let data: Data - let mimeType: String - let originalName: String + let data: Data + let mimeType: String + let originalName: String } extension QLService { - func createCopilotMessage( - workspaceId: String, - sessionId: String, - content: String, - params: AffineGraphQL.JSON, - attachments: [CopilotAttachmentUpload] - ) async throws -> String { - if attachments.isEmpty { - return try await createCopilotMessage( - input: CreateChatMessageInput( - attachments: .none, - blob: .none, - blobs: .none, - content: .some(content), - params: .some(params), - sessionId: sessionId + func createCopilotMessage( + workspaceId: String, + sessionId: String, + content: String, + params: AffineGraphQL.JSON, + attachments: [CopilotAttachmentUpload] + ) async throws -> String { + if attachments.isEmpty { + return try await createCopilotMessage( + input: CreateChatMessageInput( + attachments: .none, + blob: .none, + blobs: .none, + content: .some(content), + params: .some(params), + sessionId: sessionId + ) + ) + } + + let attachmentURLs = try await uploadCopilotAttachments( + workspaceId: workspaceId, + sessionId: sessionId, + attachments: attachments ) - ) - } - - let attachmentURLs = try await uploadCopilotAttachments( - workspaceId: workspaceId, - attachments: attachments - ) - return try await createCopilotMessage( - input: CreateChatMessageInput( - attachments: .some(attachmentURLs), - blob: .none, - blobs: .none, - content: .some(content), - params: .some(params), - sessionId: sessionId - ) - ) - } - - private func createCopilotMessage( - input: CreateChatMessageInput - ) async throws -> String { - let mutation = CreateCopilotMessageMutation(options: input) - let data = try await perform(mutation: mutation) - return data.createCopilotMessage - } - - private func uploadCopilotAttachments( - workspaceId: String, - attachments: [CopilotAttachmentUpload] - ) async throws -> [String] { - var uploadedURLs = [String]() - uploadedURLs.reserveCapacity(attachments.count) - - for attachment in attachments { - let uploadedURL = try await uploadCopilotAttachment( - workspaceId: workspaceId, - attachment: attachment - ) - uploadedURLs.append(uploadedURL) - } - - return uploadedURLs - } - - private func uploadCopilotAttachment( - workspaceId: String, - attachment: CopilotAttachmentUpload - ) async throws -> String { - let blobKey = blobKey(for: attachment) - let mutation = CreateBlobUploadMutation( - workspaceId: workspaceId, - key: blobKey, - size: attachment.data.count, - mime: attachment.mimeType - ) - let uploadData = try await perform(mutation: mutation) - let upload = uploadData.createBlobUpload - - if upload.alreadyUploaded == true { - return try await resolveSignedBlobURL(workspaceId: workspaceId, blobKey: blobKey) - } - - switch upload.method { - case .case(.graphql): - throw NSError( - domain: "QLService", - code: -1, - userInfo: [NSLocalizedDescriptionKey: "Direct upload is not available"] - ) - case .case(.presigned): - guard let uploadURL = upload.uploadUrl else { - throw NSError( - domain: "QLService", - code: -1, - userInfo: [NSLocalizedDescriptionKey: "Missing presigned upload URL"] + return try await createCopilotMessage( + input: CreateChatMessageInput( + attachments: .some(attachmentURLs), + blob: .none, + blobs: .none, + content: .some(content), + params: .some(params), + sessionId: sessionId + ) ) - } - try await put( - urlString: uploadURL, - headers: stringHeaders(from: upload.headers), - data: attachment.data, - contentType: attachment.mimeType - ) - _ = try await perform(mutation: CompleteBlobUploadMutation( - workspaceId: workspaceId, - key: blobKey, - uploadId: .none, - parts: .none - )) - case .case(.multipart): - guard let uploadId = upload.uploadId, let partSize = upload.partSize else { - throw NSError( - domain: "QLService", - code: -1, - userInfo: [NSLocalizedDescriptionKey: "Missing multipart upload metadata"] + } + + private func createCopilotMessage( + input: CreateChatMessageInput + ) async throws -> String { + let mutation = CreateCopilotMessageMutation(options: input) + let data = try await perform(mutation: mutation) + return data.createCopilotMessage + } + + private func uploadCopilotAttachments( + workspaceId: String, + sessionId: String, + attachments: [CopilotAttachmentUpload] + ) async throws -> [String] { + var uploadedURLs = [String]() + uploadedURLs.reserveCapacity(attachments.count) + + for attachment in attachments { + let uploadedURL = try await uploadCopilotAttachment( + workspaceId: workspaceId, + sessionId: sessionId, + attachment: attachment + ) + uploadedURLs.append(uploadedURL) + } + + return uploadedURLs + } + + private func uploadCopilotAttachment( + workspaceId: String, + sessionId: String, + attachment: CopilotAttachmentUpload + ) async throws -> String { + let blobKey = blobKey(for: attachment) + var components = URLComponents( + url: serverBaseURL + .appendingPathComponent("api") + .appendingPathComponent("copilot") + .appendingPathComponent("chat") + .appendingPathComponent(sessionId) + .appendingPathComponent("attachments") + .appendingPathComponent(blobKey), + resolvingAgainstBaseURL: false ) - } - let parts = try await uploadMultipartAttachment( - workspaceId: workspaceId, - blobKey: blobKey, - uploadId: uploadId, - partSize: partSize, - data: attachment.data, - uploadedParts: upload.uploadedParts ?? [] - ) - _ = try await perform(mutation: CompleteBlobUploadMutation( - workspaceId: workspaceId, - key: blobKey, - uploadId: .some(uploadId), - parts: .some(parts) - )) - case .unknown(_): - throw NSError( - domain: "QLService", - code: -1, - userInfo: [NSLocalizedDescriptionKey: "Unknown blob upload method"] - ) + components?.queryItems = [ + URLQueryItem(name: "workspaceId", value: workspaceId), + URLQueryItem(name: "mimeType", value: attachment.mimeType), + URLQueryItem(name: "fileName", value: attachment.originalName), + ] + guard let url = components?.url else { + throw NSError( + domain: "QLService", + code: -1, + userInfo: [NSLocalizedDescriptionKey: "Invalid Copilot attachment URL"] + ) + } + + var request = URLRequest(url: url) + request.httpMethod = "PUT" + request.httpBody = attachment.data + request.setValue(String(attachment.data.count), forHTTPHeaderField: "Content-Length") + request.setValue("application/octet-stream", forHTTPHeaderField: "Content-Type") + let (data, response) = try await sendAuthenticatedRequest(request) + guard (200 ..< 300).contains(response.statusCode) else { + throw NSError( + domain: "QLService", + code: response.statusCode, + userInfo: [NSLocalizedDescriptionKey: "Copilot attachment upload failed"] + ) + } + guard + let payload = try JSONSerialization.jsonObject(with: data) as? [String: Any], + let attachmentURL = payload["url"] as? String + else { + throw NSError( + domain: "QLService", + code: -1, + userInfo: [NSLocalizedDescriptionKey: "Missing Copilot attachment URL"] + ) + } + return attachmentURL } - return try await resolveSignedBlobURL(workspaceId: workspaceId, blobKey: blobKey) - } - - private func uploadMultipartAttachment( - workspaceId: String, - blobKey: String, - uploadId: String, - partSize: Int, - data: Data, - uploadedParts: [CreateBlobUploadMutation.Data.CreateBlobUpload.UploadedPart] - ) async throws -> [BlobUploadPartInput] { - var partsMap = Dictionary(uniqueKeysWithValues: uploadedParts.map { - ($0.partNumber, $0.etag) - }) - let totalParts = Int(ceil(Double(data.count) / Double(partSize))) - - for partNumber in 1...totalParts { - if partsMap[partNumber] != nil { - continue - } - - let start = (partNumber - 1) * partSize - let end = min(start + partSize, data.count) - let chunk = data.subdata(in: start.. String { + let digest = SHA256.hash(data: attachment.data) + return Data(digest).base64EncodedString() + .replacingOccurrences(of: "+", with: "-") + .replacingOccurrences(of: "/", with: "_") + .replacingOccurrences(of: "=", with: "") } - - return partsMap - .sorted { $0.key < $1.key } - .map { BlobUploadPartInput(etag: $0.value, partNumber: $0.key) } - } - - private func resolveSignedBlobURL( - workspaceId: String, - blobKey: String - ) async throws -> String { - var components = URLComponents( - url: serverBaseURL - .appendingPathComponent("api") - .appendingPathComponent("workspaces") - .appendingPathComponent(workspaceId) - .appendingPathComponent("blobs") - .appendingPathComponent(blobKey), - resolvingAgainstBaseURL: false - ) - components?.queryItems = [ - URLQueryItem(name: "redirect", value: "manual"), - ] - guard let url = components?.url else { - throw NSError( - domain: "QLService", - code: -1, - userInfo: [NSLocalizedDescriptionKey: "Invalid blob redirect URL"] - ) - } - - var request = URLRequest(url: url) - request.httpMethod = "GET" - let (data, response) = try await sendAuthenticatedRequest(request) - guard (200..<300).contains(response.statusCode) else { - throw NSError( - domain: "QLService", - code: response.statusCode, - userInfo: [NSLocalizedDescriptionKey: "Blob redirect request failed"] - ) - } - guard - let payload = try JSONSerialization.jsonObject(with: data) as? [String: Any], - let signedURL = payload["url"] as? String - else { - throw NSError( - domain: "QLService", - code: -1, - userInfo: [NSLocalizedDescriptionKey: "Missing signed blob URL"] - ) - } - return signedURL - } - - @discardableResult - private func put( - urlString: String, - headers: [String: String]?, - data: Data, - contentType: String? - ) async throws -> HTTPURLResponse { - guard let url = URL(string: urlString, relativeTo: serverBaseURL) else { - throw NSError( - domain: "QLService", - code: -1, - userInfo: [NSLocalizedDescriptionKey: "Invalid upload URL"] - ) - } - - var request = URLRequest(url: url) - request.httpMethod = "PUT" - request.httpBody = data - request.setValue(String(data.count), forHTTPHeaderField: "Content-Length") - if let contentType { - request.setValue(contentType, forHTTPHeaderField: "Content-Type") - } - headers?.forEach { key, value in - request.setValue(value, forHTTPHeaderField: key) - } - - let (_, response) = try await sendAuthenticatedRequest(request) - guard (200..<300).contains(response.statusCode) else { - throw NSError( - domain: "QLService", - code: response.statusCode, - userInfo: [NSLocalizedDescriptionKey: "Upload request failed"] - ) - } - return response - } - - private func stringHeaders( - from headers: AffineGraphQL.JSONObject? - ) -> [String: String]? { - guard let object = headers?.object else { - return nil - } - var result = [String: String]() - for (key, value) in object { - if let value = value as? String { - result[key] = value - } - } - return result.isEmpty ? nil : result - } - - private func blobKey(for attachment: CopilotAttachmentUpload) -> String { - let digest = SHA256.hash(data: attachment.data) - let encoded = Data(digest).base64EncodedString() - .replacingOccurrences(of: "+", with: "-") - .replacingOccurrences(of: "/", with: "_") - .replacingOccurrences(of: "=", with: "") - let sanitizedName = attachment.originalName - .replacingOccurrences(of: "/", with: "_") - .replacingOccurrences(of: " ", with: "_") - return "\(encoded)-\(sanitizedName)" - } } diff --git a/packages/frontend/apps/ios/package.json b/packages/frontend/apps/ios/package.json index 2cb26f7445..adf3063d61 100644 --- a/packages/frontend/apps/ios/package.json +++ b/packages/frontend/apps/ios/package.json @@ -1,6 +1,6 @@ { "name": "@affine/ios", - "version": "0.27.0", + "version": "0.27.5", "description": "AFFiNE Desktop Web application", "type": "module", "private": true, diff --git a/packages/frontend/apps/mobile-shared/package.json b/packages/frontend/apps/mobile-shared/package.json index a8344c9e03..7910dabc43 100644 --- a/packages/frontend/apps/mobile-shared/package.json +++ b/packages/frontend/apps/mobile-shared/package.json @@ -1,6 +1,6 @@ { "name": "@affine/mobile-shared", - "version": "0.27.0", + "version": "0.27.5", "type": "module", "private": true, "sideEffects": false, diff --git a/packages/frontend/apps/mobile/package.json b/packages/frontend/apps/mobile/package.json index 3af84248d3..edfcd0c05b 100644 --- a/packages/frontend/apps/mobile/package.json +++ b/packages/frontend/apps/mobile/package.json @@ -1,6 +1,6 @@ { "name": "@affine/mobile", - "version": "0.27.0", + "version": "0.27.5", "description": "AFFiNE Desktop Web application", "private": true, "browser": "src/index.tsx", diff --git a/packages/frontend/apps/web/package.json b/packages/frontend/apps/web/package.json index 4ae07de5bf..6704c0ecb5 100644 --- a/packages/frontend/apps/web/package.json +++ b/packages/frontend/apps/web/package.json @@ -1,6 +1,6 @@ { "name": "@affine/web", - "version": "0.27.0", + "version": "0.27.5", "description": "AFFiNE Desktop Web application", "private": true, "browser": "src/index.tsx", diff --git a/packages/frontend/component/package.json b/packages/frontend/component/package.json index adbb4a9281..3c959a4081 100644 --- a/packages/frontend/component/package.json +++ b/packages/frontend/component/package.json @@ -84,5 +84,5 @@ "vite": "^7.3.5", "vitest": "^4.1.8" }, - "version": "0.27.0" + "version": "0.27.5" } diff --git a/packages/frontend/core/package.json b/packages/frontend/core/package.json index 0bb074e082..4c7667d202 100644 --- a/packages/frontend/core/package.json +++ b/packages/frontend/core/package.json @@ -2,7 +2,7 @@ "name": "@affine/core", "type": "module", "private": true, - "version": "0.27.0", + "version": "0.27.5", "exports": { "./*": "./src/*", "./bootstrap": "./src/bootstrap/index.ts" diff --git a/packages/frontend/core/public/robots.txt b/packages/frontend/core/public/robots.txt index 66864824cc..13bb813d7a 100644 --- a/packages/frontend/core/public/robots.txt +++ b/packages/frontend/core/public/robots.txt @@ -2,7 +2,6 @@ User-agent: * Allow: / -Allow: /api/workspaces/*/blobs/* Disallow: /oauth/* Disallow: /workspace/* Disallow: /public-workspace/* @@ -23,4 +22,4 @@ User-agent: Bytespider Disallow: / User-agent: Barkrowler -Disallow: / \ No newline at end of file +Disallow: / diff --git a/packages/frontend/core/src/__tests__/share-page.spec.ts b/packages/frontend/core/src/__tests__/share-page.spec.ts index 213f180bd4..b95042ae21 100644 --- a/packages/frontend/core/src/__tests__/share-page.spec.ts +++ b/packages/frontend/core/src/__tests__/share-page.spec.ts @@ -1,7 +1,16 @@ +// @vitest-environment happy-dom + import { UserFriendlyError } from '@affine/error'; +import type * as AffineI18n from '@affine/i18n'; +import type { WorkerInitOptions } from '@affine/nbstore/worker/client'; +import { act, render, waitFor } from '@testing-library/react'; +import type * as Infra from '@toeverything/infra'; +import { createElement } from 'react'; +import { MemoryRouter } from 'react-router-dom'; import { TimeoutError } from 'rxjs'; import { afterEach, describe, expect, test, vi } from 'vitest'; +import { SharePage } from '../desktop/pages/workspace/share/share-page'; import { fetchSharedPublishMode, getResolvedPublishMode, @@ -11,29 +20,61 @@ import { parsePublishMode, } from '../desktop/pages/workspace/share/share-page.utils'; +const sharePageMocks = vi.hoisted(() => ({ + services: new Map(), +})); + +vi.mock('@affine/core/desktop/components/app-container', () => ({ + AppContainer: ({ children }: { children: unknown }) => children, +})); + +vi.mock('@affine/core/components/hooks/use-block-suite-editor', () => ({ + useActiveBlocksuiteEditor: () => [null, vi.fn()], +})); + +vi.mock('@affine/core/components/hooks/use-navigate-helper', () => ({ + useNavigateHelper: () => ({ + jumpToPageBlock: vi.fn(), + openPage: vi.fn(), + }), +})); + +vi.mock('@affine/i18n', async importOriginal => ({ + ...(await importOriginal()), + useI18n: () => new Proxy({}, { get: () => () => '' }), +})); + +vi.mock('@toeverything/infra', async importOriginal => ({ + ...(await importOriginal()), + useLiveData: () => undefined, + useService: (token: { name: string }) => + sharePageMocks.services.get(token.name), +})); + describe('getResolvedPublishMode', () => { - test('prefers the query mode when it is present', () => { - expect(getResolvedPublishMode('edgeless', 'page')).toBe('edgeless'); - expect(getResolvedPublishMode('page', 'edgeless')).toBe('page'); - }); - - test('falls back to the published public mode for shared docs', () => { - expect(getResolvedPublishMode(null, 'edgeless')).toBe('edgeless'); - expect(getResolvedPublishMode(null, 'page')).toBe('page'); - }); - - test('defaults to page when no mode is available', () => { - expect(getResolvedPublishMode(null, null)).toBe('page'); - expect(getResolvedPublishMode(null, undefined)).toBe('page'); - }); + test.each([ + ['edgeless', 'page', 'edgeless'], + ['page', 'edgeless', 'page'], + [null, 'edgeless', 'edgeless'], + [null, 'page', 'page'], + [null, null, 'page'], + [null, undefined, 'page'], + ] as const)( + 'resolves query %s and published mode %s', + (query, published, expected) => { + expect(getResolvedPublishMode(query, published)).toBe(expected); + } + ); }); describe('parsePublishMode', () => { - test('accepts valid publish modes only', () => { - expect(parsePublishMode('page')).toBe('page'); - expect(parsePublishMode('edgeless')).toBe('edgeless'); - expect(parsePublishMode('invalid')).toBeNull(); - expect(parsePublishMode(null)).toBeNull(); + test.each([ + ['page', 'page'], + ['edgeless', 'edgeless'], + ['invalid', null], + [null, null], + ] as const)('parses %s', (input, expected) => { + expect(parsePublishMode(input)).toBe(expected); }); }); @@ -89,44 +130,159 @@ describe('fetchSharedPublishMode', () => { }); describe('getSearchWithMode', () => { - test('adds mode to an empty search string', () => { - expect(getSearchWithMode('', 'edgeless')).toBe('?mode=edgeless'); - }); - - test('replaces an existing mode and preserves other params', () => { - expect(getSearchWithMode('?foo=1&mode=page&bar=2', 'edgeless')).toBe( - '?foo=1&mode=edgeless&bar=2' - ); + test.each([ + ['', 'edgeless', '?mode=edgeless'], + ['?foo=1&mode=page&bar=2', 'edgeless', '?foo=1&mode=edgeless&bar=2'], + ] as const)('projects %s with mode %s', (search, mode, expected) => { + expect(getSearchWithMode(search, mode)).toBe(expected); }); }); describe('share page error helpers', () => { - test('recognizes permission errors only', () => { - const permissionError = new UserFriendlyError({ - status: 403, - code: 'DOC_ACTION_DENIED', - type: 'DOC_ACTION_DENIED', - name: 'DOC_ACTION_DENIED', - message: 'forbidden', - }); - - expect(isSharePagePermissionError(permissionError)).toBe(true); - expect(isSharePagePermissionError(new TimeoutError())).toBe(false); - expect(isSharePagePermissionError(new Error('x'))).toBe(false); + const permissionError = new UserFriendlyError({ + status: 403, + code: 'DOC_ACTION_DENIED', + type: 'DOC_ACTION_DENIED', + name: 'DOC_ACTION_DENIED', + message: 'forbidden', }); - - test('recognizes timeout errors only', () => { - expect(isSharePageTimeoutError(new TimeoutError())).toBe(true); - expect( - isSharePageTimeoutError( - new UserFriendlyError({ - status: 403, - code: 'DOC_ACTION_DENIED', - type: 'DOC_ACTION_DENIED', - name: 'DOC_ACTION_DENIED', - message: 'forbidden', - }) - ) - ).toBe(false); + test.each([ + [permissionError, true, false], + [new TimeoutError(), false, true], + [new Error('x'), false, false], + ])('classifies %s', (error, permission, timeout) => { + expect(isSharePagePermissionError(error)).toBe(permission); + expect(isSharePageTimeoutError(error)).toBe(timeout); }); }); + +describe('share workspace lifecycle', () => { + afterEach(() => { + sharePageMocks.services.clear(); + }); + + test.each(['workspace-id', 'doc-id'])( + 'aborts %s loading before disposing after unmount', + async pendingDocId => { + const lifecycle: string[] = []; + let resolvePending!: () => void; + let rejectPending!: (reason: unknown) => void; + const pending = new Promise((resolve, reject) => { + resolvePending = resolve; + rejectPending = reject; + }); + const settled = pending.catch(error => error); + const dispose = vi.fn(() => lifecycle.push('dispose')); + const scopeGet = vi.fn((token: { name: string }) => { + if (token.name === 'WorkbenchService') { + return { workbench: { updateBasename: vi.fn() } }; + } + if (token.name === 'DocsService') { + return { + list: { doc$: () => ({ value: { id: 'doc-id' } }) }, + open: () => ({ + doc: { blockSuiteDoc: { load: vi.fn(), readonly: false } }, + }), + }; + } + throw new Error(`Unexpected scope service: ${token.name}`); + }); + const sharedWorkspace = { + id: 'workspace-id', + scope: { get: scopeGet }, + engine: { + doc: { + waitForDocLoaded: vi.fn((docId: string, signal?: AbortSignal) => { + if (docId !== pendingDocId) return Promise.resolve(); + signal?.addEventListener( + 'abort', + () => { + lifecycle.push('abort'); + rejectPending(signal.reason); + }, + { once: true } + ); + return pending; + }), + }, + }, + }; + const open = vi.fn( + (_options: unknown, _engineOptions?: WorkerInitOptions) => ({ + workspace: sharedWorkspace, + dispose, + }) + ); + sharePageMocks.services.set('ServerService', { + server: { baseUrl: 'https://app.affine.pro' }, + }); + sharePageMocks.services.set('WorkspacesService', { open }); + + const view = render( + createElement( + MemoryRouter, + { initialEntries: ['/share/workspace-id/doc-id?mode=page'] }, + createElement(SharePage, { + workspaceId: 'workspace-id', + docId: 'doc-id', + }) + ) + ); + await waitFor(() => expect(open).toHaveBeenCalledTimes(1)); + await waitFor(() => + expect( + sharedWorkspace.engine.doc.waitForDocLoaded + ).toHaveBeenCalledWith(pendingDocId, expect.any(AbortSignal)) + ); + view.unmount(); + await act(async () => { + resolvePending(); + await settled; + }); + expect(lifecycle).toEqual(['abort', 'dispose']); + const signals = + sharedWorkspace.engine.doc.waitForDocLoaded.mock.calls.map( + call => call[1] + ); + expect( + signals.every(signal => signal === signals[0] && signal?.aborted) + ).toBe(true); + expect( + scopeGet.mock.calls.filter(([token]) => token.name === 'DocsService') + ).toHaveLength(pendingDocId === 'doc-id' ? 1 : 0); + + const engineOptions = open.mock.calls[0]?.[1]; + if (!engineOptions) { + throw new Error('Expected custom workspace engine options'); + } + expect({ + disposeCalls: dispose.mock.calls.length, + blob: { + local: engineOptions.local.blob, + remote: engineOptions.remotes.cloud.blob, + }, + }).toMatchInlineSnapshot(` + { + "blob": { + "local": { + "name": "IndexedDBBlobStorage", + "opts": { + "flavour": "affine-cloud", + "id": "workspace-id", + "type": "workspace", + }, + }, + "remote": { + "name": "CloudBlobStorage", + "opts": { + "id": "workspace-id", + "serverBaseUrl": "https://app.affine.pro", + }, + }, + }, + "disposeCalls": 1, + } + `); + } + ); +}); diff --git a/packages/frontend/core/src/blocksuite/ai/services/block-diff.ts b/packages/frontend/core/src/blocksuite/ai/services/block-diff.ts index 11c2a52a4f..b85aa6b99f 100644 --- a/packages/frontend/core/src/blocksuite/ai/services/block-diff.ts +++ b/packages/frontend/core/src/blocksuite/ai/services/block-diff.ts @@ -1,3 +1,4 @@ +import { sourceScopedBlobUrl } from '@affine/nbstore/cloud'; import { parsePageDoc } from '@affine/reader'; import { LifeCycleWatcher } from '@blocksuite/affine/std'; import { Extension, type Store } from '@blocksuite/affine/store'; @@ -387,7 +388,11 @@ export class BlockDiffService extends Extension implements BlockDiffProvider { doc: spaceDoc, workspaceId: doc.workspace.id, buildBlobUrl: (blobId: string) => { - return `/${doc.workspace.id}/blobs/${blobId}`; + return sourceScopedBlobUrl(doc.workspace.id, blobId, { + type: 'currentDoc', + workspaceId: doc.workspace.id, + docId: doc.id, + }); }, buildDocUrl: (docId: string) => { return `/workspace/${doc.workspace.id}/${docId}`; diff --git a/packages/frontend/core/src/blocksuite/block-suite-header/menu/index.tsx b/packages/frontend/core/src/blocksuite/block-suite-header/menu/index.tsx index 756ee4b61e..5d5f5160b3 100644 --- a/packages/frontend/core/src/blocksuite/block-suite-header/menu/index.tsx +++ b/packages/frontend/core/src/blocksuite/block-suite-header/menu/index.tsx @@ -212,7 +212,7 @@ const PageHeaderMenuItem = ({ toast(t['com.affine.no-permission']()); return; } - editorService.editor.doc.moveToTrash(); + await editorService.editor.doc.moveToTrash(); }, }); }, [editorService.editor.doc, guardService, openConfirmModal, pageId, t]); diff --git a/packages/frontend/core/src/components/affine/page-history-modal/data.spec.ts b/packages/frontend/core/src/components/affine/page-history-modal/data.spec.ts new file mode 100644 index 0000000000..b3f2eb25d3 --- /dev/null +++ b/packages/frontend/core/src/components/affine/page-history-modal/data.spec.ts @@ -0,0 +1,118 @@ +// @vitest-environment happy-dom + +import type { BlobSource } from '@blocksuite/affine/sync'; +import { renderHook } from '@testing-library/react'; +import type * as Infra from '@toeverything/infra'; +import { afterEach, expect, test, vi } from 'vitest'; +import { Doc as YDoc } from 'yjs'; + +import * as WorkspaceModule from '../../../modules/workspace/impls/workspace'; +import { useSnapshotPage } from './data'; + +const historyMocks = vi.hoisted(() => ({ + services: new Map(), + sources: [] as BlobSource[], +})); + +vi.mock('@toeverything/infra', async importOriginal => ({ + ...(await importOriginal()), + useService: (token: { name: string }) => + historyMocks.services.get(token.name), +})); + +vi.mock('swr/immutable', () => ({ default: () => ({ data: undefined }) })); + +vi.mock( + '@affine/core/modules/workspace/impls/workspace', + async importOriginal => { + const actual = await importOriginal(); + return { + ...actual, + WorkspaceImpl: class extends actual.WorkspaceImpl { + constructor( + options: ConstructorParameters[0] + ) { + super(options); + if (options.blobSource) historyMocks.sources.push(options.blobSource); + } + }, + }; + } +); + +afterEach(() => { + historyMocks.services.clear(); + historyMocks.sources.length = 0; +}); + +test.each(['present', 'null', 'missing', 'no-session', 'error'])( + 'history source resolves %s without dropping its source or swallowing errors', + async mode => { + const remote = new Blob(['remote']); + const local = new Blob(['local']); + const error = new Error('permission denied'); + const get = + mode === 'error' + ? vi.fn().mockRejectedValue(error) + : vi.fn().mockResolvedValue(mode === 'present' ? remote : null); + const close = vi.fn().mockResolvedValue(undefined); + const openWorkspaceBlobSource = vi.fn(() => ({ get, close })); + const getWorkspaceBlob = vi + .fn() + .mockResolvedValue(mode === 'missing' ? null : local); + const provider = { + getWorkspaceBlob, + ...(mode === 'no-session' ? {} : { openWorkspaceBlobSource }), + }; + historyMocks.services.set('WorkspaceService', { workspace: { meta: {} } }); + historyMocks.services.set('WorkspacesService', { + getWorkspaceFlavourProvider: () => provider, + }); + historyMocks.services.set('FetchService', {}); + const collection = new WorkspaceModule.WorkspaceImpl({ + id: 'workspace-1', + rootDoc: new YDoc({ guid: 'workspace-1' }), + }); + const timestamp = '2026-09-09T00:00:00Z'; + const view = renderHook(() => + useSnapshotPage(collection, 'doc-1', timestamp) + ); + try { + expect(historyMocks.sources).toHaveLength(1); + const loading = historyMocks.sources[0].get('blob-1'); + if (mode === 'error') { + await expect(loading).rejects.toBe(error); + } else { + await expect(loading).resolves.toBe( + mode === 'present' ? remote : mode === 'missing' ? null : local + ); + } + const source = { + type: 'history', + workspaceId: 'workspace-1', + docId: 'doc-1', + timestampMs: Date.parse(timestamp), + }; + if (mode !== 'no-session') { + expect(openWorkspaceBlobSource).toHaveBeenCalledWith( + 'workspace-1', + source + ); + expect(get).toHaveBeenCalledWith('blob-1'); + } + if (mode === 'present' || mode === 'error') { + expect(getWorkspaceBlob).not.toHaveBeenCalled(); + } else { + expect(getWorkspaceBlob).toHaveBeenCalledWith( + 'workspace-1', + 'blob-1', + source + ); + } + } finally { + view.unmount(); + collection.dispose(); + } + expect(close).toHaveBeenCalledTimes(mode === 'no-session' ? 0 : 1); + } +); diff --git a/packages/frontend/core/src/components/affine/page-history-modal/data.ts b/packages/frontend/core/src/components/affine/page-history-modal/data.ts index 84250d031f..a7d8e4de85 100644 --- a/packages/frontend/core/src/components/affine/page-history-modal/data.ts +++ b/packages/frontend/core/src/components/affine/page-history-modal/data.ts @@ -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, GraphQLService } from '@affine/core/modules/cloud'; +import { FetchService } from '@affine/core/modules/cloud'; import { type WorkspaceFlavourProvider, WorkspaceService, @@ -102,39 +102,59 @@ const snapshotFetcher = async ( // so that we do not need to worry about providers etc // TODO(@Peng): fix references to the page (the referenced page will shown as deleted) // if we simply clone the current workspace, it maybe time consuming right? -const docCollectionMap = new Map(); - // assume the workspace is a cloud workspace since the history feature is only enabled for cloud workspace -const getOrCreateShellWorkspace = ( +const createShellWorkspace = ( workspaceId: string, + pageDocId: string, + timestampMs: number, flavourProvider?: WorkspaceFlavourProvider ) => { - let docCollection = docCollectionMap.get(workspaceId); - if (!docCollection) { - docCollection = new WorkspaceImpl({ - id: workspaceId, - rootDoc: new YDoc({ guid: workspaceId }), - blobSource: { - name: 'cloud', - readonly: true, - async get(key) { - return flavourProvider?.getWorkspaceBlob(workspaceId, key) ?? null; - }, - set() { - return Promise.resolve(''); - }, - delete() { - return Promise.resolve(); - }, - list() { - return Promise.resolve([]); - }, + const source = { + type: 'history' as const, + workspaceId, + docId: pageDocId, + timestampMs, + }; + const sourceSession = flavourProvider?.openWorkspaceBlobSource?.( + workspaceId, + source + ); + const docCollection = new WorkspaceImpl({ + id: workspaceId, + rootDoc: new YDoc({ guid: workspaceId }), + blobSource: { + name: 'cloud', + readonly: true, + async get(key) { + return ( + (await sourceSession?.get(key)) ?? + flavourProvider?.getWorkspaceBlob(workspaceId, key, source) ?? + null + ); }, - }); - docCollectionMap.set(workspaceId, docCollection); - docCollection.doc.emit('sync', [true, docCollection.doc]); - } - return docCollection; + set() { + return Promise.resolve(''); + }, + delete() { + return Promise.resolve(); + }, + list() { + return Promise.resolve([]); + }, + }, + }); + docCollection.doc.emit('sync', [true, docCollection.doc]); + return { + docCollection, + dispose() { + docCollection.dispose(); + sourceSession + ?.close() + .catch(error => + logger.error('Failed to close history blob source', error) + ); + }, + }; }; // workspace id + page id + timestamp -> snapshot (update binary) @@ -163,18 +183,31 @@ export const useSnapshotPage = ( ) => { const affineWorkspace = useService(WorkspaceService).workspace; const workspacesService = useService(WorkspacesService); - const fetchService = useService(FetchService); - const graphQLService = useService(GraphQLService); const snapshot = usePageHistory(docCollection.id, pageDocId, ts); + const historyShell = useMemo(() => { + if (!ts) return; + return createShellWorkspace( + docCollection.id, + pageDocId, + new Date(ts).getTime(), + workspacesService.getWorkspaceFlavourProvider(affineWorkspace.meta) + ); + }, [ + affineWorkspace.meta, + docCollection.id, + pageDocId, + ts, + workspacesService, + ]); + + useEffect(() => () => historyShell?.dispose(), [historyShell]); + const page = useMemo(() => { - if (!ts) { + if (!ts || !historyShell) { return; } const pageId = pageDocId + '-' + ts; - const historyShellWorkspace = getOrCreateShellWorkspace( - docCollection.id, - workspacesService.getWorkspaceFlavourProvider(affineWorkspace.meta) - ); + const historyShellWorkspace = historyShell.docCollection; let page = historyShellWorkspace.getDoc(pageId)?.getStore(); if (!page && snapshot) { page = historyShellWorkspace.createDoc(pageId).getStore(); @@ -185,31 +218,15 @@ export const useSnapshotPage = ( }); // must load before applyUpdate } return page ?? undefined; - }, [ - ts, - pageDocId, - docCollection.id, - workspacesService, - affineWorkspace.meta, - snapshot, - ]); + }, [historyShell, pageDocId, snapshot, ts]); useEffect(() => { - const historyShellWorkspace = getOrCreateShellWorkspace( - docCollection.id, - workspacesService.getWorkspaceFlavourProvider(affineWorkspace.meta) - ); + if (!historyShell) return; // 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); - }, [ - affineWorkspace.meta, - docCollection, - fetchService, - graphQLService, - workspacesService, - ]); + applyUpdate(historyShell.docCollection.doc, update); + }, [docCollection, historyShell]); return page; }; diff --git a/packages/frontend/core/src/components/explorer/docs-view/docs-list.tsx b/packages/frontend/core/src/components/explorer/docs-view/docs-list.tsx index fc143f819f..9a30babc60 100644 --- a/packages/frontend/core/src/components/explorer/docs-view/docs-list.tsx +++ b/packages/frontend/core/src/components/explorer/docs-view/docs-list.tsx @@ -192,12 +192,13 @@ export const DocsExplorer = ({ confirmButtonOptions: { variant: 'error', }, - onConfirm: () => { + onConfirm: async () => { const selectedDocIds = contextValue.selectedDocIds$.value; - for (const docId of selectedDocIds) { - const doc = docsService.list.doc$(docId).value; - doc?.moveToTrash(); - } + await Promise.all( + selectedDocIds.map(async docId => { + await docsService.list.doc$(docId).value?.moveToTrash(); + }) + ); handleCloseFloatingToolbar(); }, }); diff --git a/packages/frontend/core/src/components/explorer/docs-view/more-menu.tsx b/packages/frontend/core/src/components/explorer/docs-view/more-menu.tsx index 77b1c486a6..2cddfc0493 100644 --- a/packages/frontend/core/src/components/explorer/docs-view/more-menu.tsx +++ b/packages/frontend/core/src/components/explorer/docs-view/more-menu.tsx @@ -167,8 +167,8 @@ const MoveToTrash = ({ docId }: DocOperationProps) => { confirmButtonOptions: { variant: 'error', }, - onConfirm: () => { - doc.moveToTrash(); + onConfirm: async () => { + await doc.moveToTrash(); }, }); }, [doc, openConfirmModal, t]); diff --git a/packages/frontend/core/src/components/explorer/docs-view/quick-actions.tsx b/packages/frontend/core/src/components/explorer/docs-view/quick-actions.tsx index ef6e2fe32b..b2321bab35 100644 --- a/packages/frontend/core/src/components/explorer/docs-view/quick-actions.tsx +++ b/packages/frontend/core/src/components/explorer/docs-view/quick-actions.tsx @@ -170,7 +170,7 @@ export const QuickDelete = memo(function QuickDelete({ toast(t['com.affine.no-permission']()); return; } - doc.moveToTrash(); + await doc.moveToTrash(); } catch (error) { console.error(error); const userFriendlyError = UserFriendlyError.fromAny(error); @@ -251,20 +251,18 @@ export const QuickDeletePermanently = memo(function QuickDeletePermanently({ ); const { openConfirmModal } = useConfirmModal(); - const handleDeletePermanently = useCallback(() => { - guardService - .can('Doc_Delete', doc.id) - .then(can => { - if (can) { - permanentlyDeletePage(doc.id); - toast(t['com.affine.toastMessage.permanentlyDeleted']()); - } else { - toast(t['com.affine.no-permission']()); - } - }) - .catch(e => { - console.error(e); - }); + const handleDeletePermanently = useCallback(async () => { + try { + const canDelete = await guardService.can('Doc_Delete', doc.id); + if (canDelete) { + await permanentlyDeletePage(doc.id); + toast(t['com.affine.toastMessage.permanentlyDeleted']()); + } else { + toast(t['com.affine.no-permission']()); + } + } catch (error) { + console.error(error); + } }, [doc.id, guardService, permanentlyDeletePage, t]); const handleConfirmDeletePermanently = useCallback( @@ -319,9 +317,9 @@ export const QuickRestore = memo(function QuickRestore({ e.preventDefault(); guardService .can('Doc_Delete', doc.id) - .then(can => { + .then(async can => { if (can) { - restoreFromTrash(doc.id); + await restoreFromTrash(doc.id); toast( t['com.affine.toastMessage.restored']({ title: doc.title$.value || 'Untitled', @@ -331,8 +329,8 @@ export const QuickRestore = memo(function QuickRestore({ toast(t['com.affine.no-permission']()); } }) - .catch(e => { - console.error(e); + .catch(error => { + console.error(error); }); }, [doc.id, doc.title$, guardService, onClick, restoreFromTrash, t] diff --git a/packages/frontend/core/src/components/hooks/affine/use-block-suite-meta-helper.ts b/packages/frontend/core/src/components/hooks/affine/use-block-suite-meta-helper.ts index 36913ab577..5cc3cad330 100644 --- a/packages/frontend/core/src/components/hooks/affine/use-block-suite-meta-helper.ts +++ b/packages/frontend/core/src/components/hooks/affine/use-block-suite-meta-helper.ts @@ -15,20 +15,20 @@ export function useBlockSuiteMetaHelper() { // TODO-Doma // "Remove" may cause ambiguity here. Consider renaming as "moveToTrash". const removeToTrash = useCallback( - (docId: string) => { + async (docId: string) => { const docRecord = docRecordList.doc$(docId).value; if (docRecord) { - docRecord.moveToTrash(); + await docRecord.moveToTrash(); } }, [docRecordList] ); const restoreFromTrash = useCallback( - (docId: string) => { + async (docId: string) => { const docRecord = docRecordList.doc$(docId).value; if (docRecord) { - docRecord.restoreFromTrash(); + await docRecord.restoreFromTrash(); } }, [docRecordList] @@ -36,9 +36,10 @@ export function useBlockSuiteMetaHelper() { const permanentlyDeletePage = useCallback( (pageId: string) => { - workspace.docCollection.removeDoc(pageId); + const docRecord = docRecordList.doc$(pageId).value; + return docRecord?.deletePermanently(); }, - [workspace] + [docRecordList] ); const duplicate = useAsyncCallback( diff --git a/packages/frontend/core/src/components/hooks/affine/use-register-blocksuite-editor-commands.tsx b/packages/frontend/core/src/components/hooks/affine/use-register-blocksuite-editor-commands.tsx index f5af5954bb..2f048929e2 100644 --- a/packages/frontend/core/src/components/hooks/affine/use-register-blocksuite-editor-commands.tsx +++ b/packages/frontend/core/src/components/hooks/affine/use-register-blocksuite-editor-commands.tsx @@ -87,7 +87,7 @@ export function useRegisterBlocksuiteEditorCommands( toast(t['com.affine.no-permission']()); return; } - doc.moveToTrash(); + await doc.moveToTrash(); } catch (error) { console.error(error); const userFriendlyError = UserFriendlyError.fromAny(error); @@ -336,7 +336,7 @@ export function useRegisterBlocksuiteEditorCommands( } track.$.cmdk.editor.restoreDoc(); - doc.restoreFromTrash(); + await doc.restoreFromTrash(); }, }) ); diff --git a/packages/frontend/core/src/components/page-list/operation-cell.tsx b/packages/frontend/core/src/components/page-list/operation-cell.tsx index e08eabd54f..796991ee76 100644 --- a/packages/frontend/core/src/components/page-list/operation-cell.tsx +++ b/packages/frontend/core/src/components/page-list/operation-cell.tsx @@ -117,8 +117,8 @@ const PageOperationCellMenuItem = ({ confirmButtonOptions: { variant: 'error', }, - onConfirm: () => { - docRecord.moveToTrash(); + onConfirm: async () => { + await docRecord.moveToTrash(); }, }); }, [docRecord, openConfirmModal, t]); diff --git a/packages/frontend/core/src/components/pure/trash-page-footer/index.tsx b/packages/frontend/core/src/components/pure/trash-page-footer/index.tsx index 5423bd0cd8..4aedf22e0f 100644 --- a/packages/frontend/core/src/components/pure/trash-page-footer/index.tsx +++ b/packages/frontend/core/src/components/pure/trash-page-footer/index.tsx @@ -25,12 +25,15 @@ export const TrashPageFooter = () => { const hintText = t['com.affine.cmdk.affine.editor.trash-footer-hint'](); const onRestore = useCallback(() => { - restoreFromTrash(doc.id); - toast( - t['com.affine.toastMessage.restored']({ - title: doc.meta$.value.title || 'Untitled', + restoreFromTrash(doc.id) + .then(() => { + toast( + t['com.affine.toastMessage.restored']({ + title: doc.meta$.value.title || 'Untitled', + }) + ); }) - ); + .catch(error => console.error(error)); }, [doc.id, doc.meta$.value.title, restoreFromTrash, t]); const onConfirmDelete = useCallback(() => { diff --git a/packages/frontend/core/src/components/root-app-sidebar/trash-button.tsx b/packages/frontend/core/src/components/root-app-sidebar/trash-button.tsx index b3f693647d..63308c9564 100644 --- a/packages/frontend/core/src/components/root-app-sidebar/trash-button.tsx +++ b/packages/frontend/core/src/components/root-app-sidebar/trash-button.tsx @@ -55,7 +55,7 @@ export const TrashButton = () => { toast(t['com.affine.no-permission']()); return; } - docRecord.moveToTrash(); + await docRecord.moveToTrash(); } catch (error) { console.error(error); const userFriendlyError = UserFriendlyError.fromAny(error); diff --git a/packages/frontend/core/src/desktop/components/navigation-panel/nodes/doc/operations.tsx b/packages/frontend/core/src/desktop/components/navigation-panel/nodes/doc/operations.tsx index 534fee7725..02f3b0ba29 100644 --- a/packages/frontend/core/src/desktop/components/navigation-panel/nodes/doc/operations.tsx +++ b/packages/frontend/core/src/desktop/components/navigation-panel/nodes/doc/operations.tsx @@ -93,8 +93,8 @@ export const useNavigationPanelDocNodeOperations = ( confirmButtonOptions: { variant: 'error', }, - onConfirm() { - docRecord.moveToTrash(); + async onConfirm() { + await docRecord.moveToTrash(); track.$.navigationPanel.docs.deleteDoc({ control: 'button', }); diff --git a/packages/frontend/core/src/desktop/dialogs/setting/workspace-setting/storage/blob-management.tsx b/packages/frontend/core/src/desktop/dialogs/setting/workspace-setting/storage/blob-management.tsx index 295bf65d35..774894e4df 100644 --- a/packages/frontend/core/src/desktop/dialogs/setting/workspace-setting/storage/blob-management.tsx +++ b/packages/frontend/core/src/desktop/dialogs/setting/workspace-setting/storage/blob-management.tsx @@ -4,7 +4,6 @@ import { Loading, templateToString, useConfirmModal, - useDisposable, } from '@affine/component'; import { Pagination } from '@affine/component/setting-components'; import { BlobManagementService } from '@affine/core/modules/blob-management/services'; @@ -28,60 +27,24 @@ const Empty = () => { ); }; -const useBlob = (blobRecord: ListedBlobRecord) => { - const unusedBlobsEntity = useService(BlobManagementService).unusedBlobs; - return useDisposable( - (abortSignal?: AbortSignal) => - unusedBlobsEntity.hydrateBlob(blobRecord, abortSignal), - [blobRecord] - ); -}; - const BlobPreview = ({ blobRecord }: { blobRecord: ListedBlobRecord }) => { - const { data, loading, error } = useBlob(blobRecord); - - const element = useMemo(() => { - if (loading) return ; - if (!data?.url || !data.type) return null; - - const { url, type, mime } = data; - - const icon = templateToString(getAttachmentFileIcon(type)); - - if (error) { - return ( -
- ); - } - - if (mime?.startsWith('image/')) { - return ( - {blobRecord.key} - ); - } else { - return ( -
- ); - } - }, [loading, data, error, blobRecord.key]); + const type = blobRecord.mime?.startsWith('text/') + ? 'txt' + : blobRecord.mime?.split('/')[1] || 'unknown'; + const icon = templateToString(getAttachmentFileIcon(type)); return (
-
{element}
+
+
+
{blobRecord.key}
- {data?.type ? `${data.type} · ` : ''} + {type !== 'unknown' ? `${type} · ` : ''} {bytes(blobRecord.size)}
diff --git a/packages/frontend/core/src/desktop/dialogs/setting/workspace-setting/storage/style.css.ts b/packages/frontend/core/src/desktop/dialogs/setting/workspace-setting/storage/style.css.ts index 10aff8c8da..82c9bd5b86 100644 --- a/packages/frontend/core/src/desktop/dialogs/setting/workspace-setting/storage/style.css.ts +++ b/packages/frontend/core/src/desktop/dialogs/setting/workspace-setting/storage/style.css.ts @@ -145,12 +145,6 @@ globalStyle(`${blobGridItemCheckbox} path`, { backgroundColor: cssVarV2('layer/background/primary'), }); -export const blobImagePreview = style({ - width: '100%', - height: '100%', - objectFit: 'contain', -}); - export const unknownBlobIcon = style({}); export const blobPreviewFooter = style({ diff --git a/packages/frontend/core/src/desktop/pages/workspace/detail-page/tabs/journal/index.tsx b/packages/frontend/core/src/desktop/pages/workspace/detail-page/tabs/journal/index.tsx index 23e1ccff8a..8e7ea77cb0 100644 --- a/packages/frontend/core/src/desktop/pages/workspace/detail-page/tabs/journal/index.tsx +++ b/packages/frontend/core/src/desktop/pages/workspace/detail-page/tabs/journal/index.tsx @@ -458,8 +458,8 @@ const ConflictList = ({ variant: 'error', }, confirmText: t.Delete(), - onConfirm: () => { - docRecord.moveToTrash(); + onConfirm: async () => { + await docRecord.moveToTrash(); }, }); }, diff --git a/packages/frontend/core/src/desktop/pages/workspace/share/share-page.tsx b/packages/frontend/core/src/desktop/pages/workspace/share/share-page.tsx index 075443ac10..d665b48e1d 100644 --- a/packages/frontend/core/src/desktop/pages/workspace/share/share-page.tsx +++ b/packages/frontend/core/src/desktop/pages/workspace/share/share-page.tsx @@ -198,10 +198,8 @@ const SharePageInner = ({ useEffect(() => { if (resolvedPublishMode === null) return; - if (editor || workspace || page) return; - // create a workspace for share page - const { workspace: sharedWorkspace } = workspacesService.open( + const { workspace: sharedWorkspace, dispose } = workspacesService.open( { metadata: { id: workspaceId, @@ -220,30 +218,56 @@ const SharePageInner = ({ }, }, blob: { - name: 'CloudBlobStorage', + name: BUILD_CONFIG.isElectron + ? 'SqliteBlobStorage' + : 'IndexedDBBlobStorage', opts: { id: workspaceId, - serverBaseUrl: serverService.server.baseUrl, + flavour: 'affine-cloud', + type: 'workspace', + }, + }, + }, + remotes: { + cloud: { + blob: { + name: 'CloudBlobStorage', + opts: { + id: workspaceId, + serverBaseUrl: serverService.server.baseUrl, + }, }, }, }, - remotes: {}, } ); + const controller = new AbortController(); setWorkspace(sharedWorkspace); + setPage(null); + setEditor(null); + + (async () => { + try { + await sharedWorkspace.engine.doc.waitForDocLoaded( + sharedWorkspace.id, + controller.signal + ); + if (controller.signal.aborted) return; - sharedWorkspace.engine.doc - .waitForDocLoaded(sharedWorkspace.id) - .then(async () => { const docsService = sharedWorkspace.scope.get(DocsService); await waitForSharedDocRecord(docsService, docId); + if (controller.signal.aborted) return; const { doc } = docsService.open(docId); doc.blockSuiteDoc.load(); doc.blockSuiteDoc.readonly = true; - await sharedWorkspace.engine.doc.waitForDocLoaded(docId); + await sharedWorkspace.engine.doc.waitForDocLoaded( + docId, + controller.signal + ); + if (controller.signal.aborted) return; if (!doc.blockSuiteDoc.root) { throw new Error('Doc is empty'); @@ -259,8 +283,8 @@ const SharePageInner = ({ } setEditor(editor); - }) - .catch(err => { + } catch (err) { + if (controller.signal.aborted) return; console.error(err); if (isSharePagePermissionError(err)) { setNoPermission(true); @@ -273,15 +297,18 @@ const SharePageInner = ({ } setLoadFailed(true); - }); + } + })().catch(console.error); + + return () => { + controller.abort(); + dispose(); + }; }, [ docId, - editor, - page, resolvedPublishMode, selector, workspaceId, - workspace, workspacesService, serverService.server.baseUrl, ]); diff --git a/packages/frontend/core/src/desktop/pages/workspace/trash-page.tsx b/packages/frontend/core/src/desktop/pages/workspace/trash-page.tsx index 756920c3a2..11413bd65d 100644 --- a/packages/frontend/core/src/desktop/pages/workspace/trash-page.tsx +++ b/packages/frontend/core/src/desktop/pages/workspace/trash-page.tsx @@ -111,23 +111,26 @@ export const TrashPage = () => { const handleMultiRestore = useCallback( (ids: string[]) => { - ids.forEach(id => { - restoreFromTrash(id); - }); - toast( - t['com.affine.toastMessage.restored']({ - title: ids.length > 1 ? 'docs' : 'doc', + Promise.all(ids.map(id => restoreFromTrash(id))) + .then(() => { + toast( + t['com.affine.toastMessage.restored']({ + title: ids.length > 1 ? 'docs' : 'doc', + }) + ); }) - ); + .catch(error => console.error(error)); }, [restoreFromTrash, t] ); const handleMultiDelete = useCallback( - (ids: string[]) => { - ids.forEach(pageId => { - permanentlyDeletePage(pageId); - }); + async (ids: string[]) => { + await Promise.all( + ids.map(async pageId => { + await permanentlyDeletePage(pageId); + }) + ); toast(t['com.affine.toastMessage.permanentlyDeleted']()); }, [permanentlyDeletePage, t] @@ -152,8 +155,8 @@ export const TrashPage = () => { confirmButtonOptions: { variant: 'error', }, - onConfirm: () => { - handleMultiDelete(ids); + onConfirm: async () => { + await handleMultiDelete(ids); callbacks?.onFinished?.(); }, onCancel: () => { diff --git a/packages/frontend/core/src/mobile/components/navigation/nodes/doc/operations.tsx b/packages/frontend/core/src/mobile/components/navigation/nodes/doc/operations.tsx index 60fdd7a530..81f6b778d5 100644 --- a/packages/frontend/core/src/mobile/components/navigation/nodes/doc/operations.tsx +++ b/packages/frontend/core/src/mobile/components/navigation/nodes/doc/operations.tsx @@ -91,8 +91,8 @@ export const useNavigationPanelDocNodeOperations = (docId: string) => { confirmButtonOptions: { variant: 'error', }, - onConfirm() { - docRecord.moveToTrash(); + async onConfirm() { + await docRecord.moveToTrash(); track.$.navigationPanel.docs.deleteDoc({ control: 'button', }); diff --git a/packages/frontend/core/src/mobile/pages/workspace/detail/menu/journal-conflicts.tsx b/packages/frontend/core/src/mobile/pages/workspace/detail/menu/journal-conflicts.tsx index 15b587bbab..624a877aec 100644 --- a/packages/frontend/core/src/mobile/pages/workspace/detail/menu/journal-conflicts.tsx +++ b/packages/frontend/core/src/mobile/pages/workspace/detail/menu/journal-conflicts.tsx @@ -43,8 +43,8 @@ export const ResolveConflictOperations = ({ confirmButtonOptions: { variant: 'error', }, - onConfirm: () => { - docRecord.moveToTrash(); + onConfirm: async () => { + await docRecord.moveToTrash(); }, }); }, diff --git a/packages/frontend/core/src/mobile/pages/workspace/detail/page-header-more-button.tsx b/packages/frontend/core/src/mobile/pages/workspace/detail/page-header-more-button.tsx index cdf5616d19..d1d6cd2285 100644 --- a/packages/frontend/core/src/mobile/pages/workspace/detail/page-header-more-button.tsx +++ b/packages/frontend/core/src/mobile/pages/workspace/detail/page-header-more-button.tsx @@ -107,8 +107,8 @@ export const PageHeaderMenuButton = () => { confirmButtonOptions: { variant: 'error', }, - onConfirm() { - doc.moveToTrash(); + async onConfirm() { + await doc.moveToTrash(); track.$.navigationPanel.docs.deleteDoc({ control: 'button', }); diff --git a/packages/frontend/core/src/modules/blob-management/entity/unused-blobs.spec.ts b/packages/frontend/core/src/modules/blob-management/entity/unused-blobs.spec.ts index 2d1f12a34b..ac94818bba 100644 --- a/packages/frontend/core/src/modules/blob-management/entity/unused-blobs.spec.ts +++ b/packages/frontend/core/src/modules/blob-management/entity/unused-blobs.spec.ts @@ -20,18 +20,20 @@ describe('UnusedBlobs', () => { pagination: { hasMore: false }, buckets: [{ key: 'used-2' }], }); + const getWorkspaceBlob = vi.fn(); const flavoursService = { flavours$: { value: [ { flavour: 'local', - listBlobs: vi + listManageableBlobs: vi .fn() .mockResolvedValue([ { key: 'used-1' }, { key: 'used-2' }, { key: 'unused' }, ]), + getWorkspaceBlob, }, ], }, @@ -69,6 +71,8 @@ describe('UnusedBlobs', () => { const entity = framework.provider().createEntity(UnusedBlobs); await expect(entity.getUnusedBlobs()).resolves.toEqual([{ key: 'unused' }]); + expect(entity).not.toHaveProperty('hydrateBlob'); + expect(getWorkspaceBlob).not.toHaveBeenCalled(); expect(aggregate).toHaveBeenCalledTimes(2); expect(aggregate.mock.calls.map(call => call[3])).toEqual([ { pagination: { limit: 1000, skip: 0 }, prefer: 'local' }, diff --git a/packages/frontend/core/src/modules/blob-management/entity/unused-blobs.ts b/packages/frontend/core/src/modules/blob-management/entity/unused-blobs.ts index 4f0bf5361d..e84260b5ad 100644 --- a/packages/frontend/core/src/modules/blob-management/entity/unused-blobs.ts +++ b/packages/frontend/core/src/modules/blob-management/entity/unused-blobs.ts @@ -7,19 +7,12 @@ import { onComplete, onStart, } from '@toeverything/infra'; -import { fileTypeFromBuffer } from 'file-type'; import { switchMap, tap } from 'rxjs'; import type { DocsSearchService } from '../../docs-search'; import type { WorkspaceService } from '../../workspace'; import type { WorkspaceFlavoursService } from '../../workspace/services/flavours'; -interface HydratedBlobRecord extends ListedBlobRecord, Disposable { - url: string; - extension?: string; - type?: string; -} - export class UnusedBlobs extends Entity { constructor( private readonly flavoursService: WorkspaceFlavoursService, @@ -52,23 +45,15 @@ export class UnusedBlobs extends Entity { ); } - async listBlobs() { - const blobs = await this.flavourProvider?.listBlobs( + async listManageableBlobs() { + const blobs = await this.flavourProvider?.listManageableBlobs( this.workspaceService.workspace.id ); return blobs; } - async getBlob(blobKey: string) { - const blob = await this.flavourProvider?.getWorkspaceBlob( - this.workspaceService.workspace.id, - blobKey - ); - return blob; - } - async deleteBlob(blob: string, permanent: boolean) { - await this.flavourProvider?.deleteBlob( + await this.flavourProvider?.deleteManagedBlob( this.workspaceService.workspace.id, blob, permanent @@ -82,7 +67,7 @@ export class UnusedBlobs extends Entity { await this.docsSearchService.indexer.waitForCompleted(abortSignal); const [blobs, usedBlobs] = await Promise.all([ - this.listBlobs(), + this.listManageableBlobs(), this.getUsedBlobs(), ]); @@ -105,12 +90,7 @@ export class UnusedBlobs extends Entity { { type: 'boolean', occur: 'must', - queries: [ - { - type: 'exists', - field: 'blob', - }, - ], + queries: [{ type: 'exists', field: 'blob' }], }, 'blob', { pagination: { limit, skip }, prefer: 'local' } @@ -122,37 +102,4 @@ export class UnusedBlobs extends Entity { } } } - - async hydrateBlob( - record: ListedBlobRecord, - abortSignal?: AbortSignal - ): Promise { - const blob = await this.getBlob(record.key); - - if (!blob || abortSignal?.aborted) { - return null; - } - - const fileType = await fileTypeFromBuffer(await blob.arrayBuffer()); - - if (abortSignal?.aborted) { - return null; - } - - const mime = record.mime || fileType?.mime || 'unknown'; - const url = URL.createObjectURL(new Blob([blob], { type: mime })); - // todo(@pengx17): the following may not be sufficient - const extension = fileType?.ext; - const type = extension ?? (mime?.startsWith('text/') ? 'txt' : 'unknown'); - return { - ...record, - url, - extension, - type, - mime, - [Symbol.dispose]: () => { - URL.revokeObjectURL(url); - }, - }; - } } diff --git a/packages/frontend/core/src/modules/cloud/entities/user-quota.spec.ts b/packages/frontend/core/src/modules/cloud/entities/user-quota.spec.ts index 6106fb47a8..417fdfd4c8 100644 --- a/packages/frontend/core/src/modules/cloud/entities/user-quota.spec.ts +++ b/packages/frontend/core/src/modules/cloud/entities/user-quota.spec.ts @@ -53,41 +53,22 @@ function createEntity(store: UserQuotaStore) { } describe('UserQuota', () => { - test('uses realtime quota state snapshots and refreshes on quota events', async () => { - const events$ = new Subject<{ type: 'ready' } | { changed: true }>(); - const store = createStore( - { - fetchUserQuotaState: vi - .fn() - .mockResolvedValueOnce(createQuotaState({ usedStorageQuota: 512 })) - .mockResolvedValueOnce(createQuotaState({ usedStorageQuota: 768 })), - }, - events$ - ); + test('projects user quota state', async () => { + const store = createStore({ + fetchUserQuotaState: vi + .fn() + .mockResolvedValue( + createQuotaState({ seatLimit: 9, usedStorageQuota: 512 }) + ), + }); const quota = createEntity(store); quota.revalidate(); await vi.waitFor(() => expect(quota.used$.value).toBe(512)); expect(quota.quota$.value?.humanReadable.historyPeriod).toBe('30 days'); - - events$.next({ changed: true }); - await vi.waitFor(() => expect(quota.used$.value).toBe(768)); - - expect(store.fetchUserQuotaState).toHaveBeenCalledTimes(2); - quota.dispose(); - }); - - test('surfaces realtime quota errors without GraphQL fallback', async () => { - const error = new Error('offline'); - const store = createStore({ - fetchUserQuotaState: vi.fn().mockRejectedValue(error), - }); - const quota = createEntity(store); - - quota.revalidate(); - - await vi.waitFor(() => expect(quota.error$.value).toBe(error)); - expect(quota.quota$.value).toBeNull(); + expect(quota.quota$.value?.memberLimit).toBe(9); + expect(store.fetchUserQuotaState).toHaveBeenCalledTimes(1); + expect(store.subscribeUserQuotaState).toHaveBeenCalledTimes(1); quota.dispose(); }); }); diff --git a/packages/frontend/core/src/modules/cloud/stores/server-config.spec.ts b/packages/frontend/core/src/modules/cloud/stores/server-config.spec.ts index e3a99c5786..451f9824ac 100644 --- a/packages/frontend/core/src/modules/cloud/stores/server-config.spec.ts +++ b/packages/frontend/core/src/modules/cloud/stores/server-config.spec.ts @@ -3,44 +3,36 @@ import { describe, expect, test } from 'vitest'; import { assertSupportedServerVersion, - getSyncProtocol, isBatchSyncServerVersion, MIN_SUPPORTED_SERVER_VERSION, } from './server-config'; describe('server config version guard', () => { - test('selects batch sync from server version', () => { - expect(isBatchSyncServerVersion('0.27.4')).toBe(false); - expect(isBatchSyncServerVersion('0.27.5')).toBe(true); - expect(isBatchSyncServerVersion('0.27.5-beta.1')).toBe(true); - expect(isBatchSyncServerVersion('2026.8.20-canary.15')).toBe(true); - expect(isBatchSyncServerVersion('0.28.0')).toBe(true); + test.each([ + ['0.26.9', false], + ['0.27.0', true], + ['0.27.0-beta.1', true], + ['2026.8.20-canary.15', true], + ['0.28.0', true], + ])('selects batch sync for %s', (version, expected) => { + expect(isBatchSyncServerVersion(version)).toBe(expected); }); - test('does not select a route before server version is verified', () => { - expect(() => getSyncProtocol()).toThrow(UserFriendlyError); - expect(() => getSyncProtocol('0.26.9')).toThrow(UserFriendlyError); - expect(getSyncProtocol('0.27.4')).toBe('legacy'); - expect(getSyncProtocol('0.27.5')).toBe('batch'); - }); - - test('accepts supported server versions', () => { - expect(() => assertSupportedServerVersion('0.27.0')).not.toThrow(); - expect(() => assertSupportedServerVersion('0.27.0-beta.5')).not.toThrow(); - expect(() => assertSupportedServerVersion('0.27.0-rc.1')).not.toThrow(); - expect(() => assertSupportedServerVersion('0.28.0')).not.toThrow(); - }); - - test('rejects old server versions', () => { - for (const version of ['0.26.9', '0.26.9-beta.5']) { - expect(() => assertSupportedServerVersion(version)).toThrow( - UserFriendlyError - ); - } - }); - - test('rejects missing or invalid server versions', () => { - for (const version of [undefined, null, '', 'not-a-version']) { + test.each([ + ['0.27.0', true], + ['0.27.0-beta.5', true], + ['0.27.0-rc.1', true], + ['0.28.0', true], + ['0.26.9', false], + ['0.26.9-beta.5', false], + [undefined, false], + [null, false], + ['', false], + ['not-a-version', false], + ])('validates server version %s', (version, supported) => { + if (supported) { + expect(() => assertSupportedServerVersion(version)).not.toThrow(); + } else { expect(() => assertSupportedServerVersion(version)).toThrow( UserFriendlyError ); diff --git a/packages/frontend/core/src/modules/cloud/stores/server-config.ts b/packages/frontend/core/src/modules/cloud/stores/server-config.ts index a72f43bbfc..fb053259b6 100644 --- a/packages/frontend/core/src/modules/cloud/stores/server-config.ts +++ b/packages/frontend/core/src/modules/cloud/stores/server-config.ts @@ -13,8 +13,8 @@ import semver from 'semver'; export type ServerConfigType = ServerConfigQuery['serverConfig'] & OauthProvidersQuery['serverConfig']; -export const MIN_SUPPORTED_SERVER_VERSION = '0.27.0'; -export const BATCH_SYNC_SERVER_VERSION = '0.27.5'; +export const BATCH_SYNC_SERVER_VERSION = '0.27.0'; +export const MIN_SUPPORTED_SERVER_VERSION = BATCH_SYNC_SERVER_VERSION; const NETWORK_ERROR_PATTERNS = [ /failed to fetch/i, @@ -74,11 +74,6 @@ export function isBatchSyncServerVersion(version?: string | null) { ); } -export function getSyncProtocol(version?: string | null) { - assertSupportedServerVersion(version); - return isBatchSyncServerVersion(version) ? 'batch' : 'legacy'; -} - function mapServerConfigError(error: unknown) { const userFriendlyError = UserFriendlyError.fromAny(error); if ( diff --git a/packages/frontend/core/src/modules/doc/entities/doc.ts b/packages/frontend/core/src/modules/doc/entities/doc.ts index 98ca9d5c33..20f9765d12 100644 --- a/packages/frontend/core/src/modules/doc/entities/doc.ts +++ b/packages/frontend/core/src/modules/doc/entities/doc.ts @@ -127,6 +127,10 @@ export class Doc extends Entity { return this.record.restoreFromTrash(); } + deletePermanently() { + return this.record.deletePermanently(); + } + waitForSyncReady() { return this.store.waitForDocLoadReady(this.id); } diff --git a/packages/frontend/core/src/modules/doc/entities/record.ts b/packages/frontend/core/src/modules/doc/entities/record.ts index 3db4972f27..52c03609e5 100644 --- a/packages/frontend/core/src/modules/doc/entities/record.ts +++ b/packages/frontend/core/src/modules/doc/entities/record.ts @@ -83,11 +83,15 @@ export class DocRecord extends Entity<{ id: string }> { } moveToTrash() { - return this.setMeta({ trash: true, trashDate: Date.now() }); + return this.docsStore.applyDocLifecycle(this.id, 'trash'); } restoreFromTrash() { - return this.setMeta({ trash: false, trashDate: undefined }); + return this.docsStore.applyDocLifecycle(this.id, 'restore'); + } + + deletePermanently() { + return this.docsStore.applyDocLifecycle(this.id, 'delete'); } title$ = this.meta$.map(meta => meta.title ?? ''); diff --git a/packages/frontend/core/src/modules/doc/stores/docs.ts b/packages/frontend/core/src/modules/doc/stores/docs.ts index 8a6947240b..3b76c27bbf 100644 --- a/packages/frontend/core/src/modules/doc/stores/docs.ts +++ b/packages/frontend/core/src/modules/doc/stores/docs.ts @@ -9,7 +9,7 @@ import { } from '@toeverything/infra'; import { nanoid } from 'nanoid'; import { distinctUntilChanged, map, switchMap } from 'rxjs'; -import { Array as YArray, Map as YMap, transact } from 'yjs'; +import { applyUpdate, Array as YArray, Map as YMap, transact } from 'yjs'; import type { WorkspaceService } from '../../workspace'; import type { DocPropertiesStore } from './doc-properties'; @@ -248,6 +248,31 @@ export class DocsStore extends Store { this.workspaceService.workspace.docCollection.meta.setDocMeta(id, meta); } + async applyDocLifecycle( + id: string, + lifecycle: 'trash' | 'restore' | 'delete' + ) { + const workspace = this.workspaceService.workspace; + if (workspace.flavour === 'local') { + if (lifecycle === 'delete') { + workspace.docCollection.removeDoc(id); + } else { + this.setDocMeta( + id, + lifecycle === 'trash' + ? { trash: true, trashDate: Date.now() } + : { trash: false, trashDate: undefined } + ); + } + return; + } + const result = await workspace.engine.doc.applyDocLifecycle(id, lifecycle); + applyUpdate(workspace.rootYDoc, result.rootUpdate, 'server-lifecycle'); + if (lifecycle === 'delete') { + await workspace.engine.doc.storage.deleteDoc(id); + } + } + setDocPrimaryModeSetting(id: string, mode: DocMode) { return this.docPropertiesStore.updateDocProperties(id, { primaryMode: mode, diff --git a/packages/frontend/core/src/modules/integration/entities/readwise.ts b/packages/frontend/core/src/modules/integration/entities/readwise.ts index 75c87b90eb..e22f558c4c 100644 --- a/packages/frontend/core/src/modules/integration/entities/readwise.ts +++ b/packages/frontend/core/src/modules/integration/entities/readwise.ts @@ -237,7 +237,7 @@ export class ReadwiseIntegration extends Entity<{ writer: IntegrationWriter }> { refs.map(async ref => { const doc = this.docsService.list.doc$(ref.id).value; if (doc) { - doc.moveToTrash(); + await doc.moveToTrash(); } return this.integrationRefStore.deleteRef(ref.id); }) diff --git a/packages/frontend/core/src/modules/quota/entities/quota.spec.ts b/packages/frontend/core/src/modules/quota/entities/quota.spec.ts index bd9aaaf8f9..3c472a5d3e 100644 --- a/packages/frontend/core/src/modules/quota/entities/quota.spec.ts +++ b/packages/frontend/core/src/modules/quota/entities/quota.spec.ts @@ -54,41 +54,24 @@ function createEntity(store: WorkspaceQuotaStore) { } describe('WorkspaceQuota', () => { - test('uses realtime quota state snapshots and refreshes on quota events', async () => { - const events$ = new Subject<{ type: 'ready' } | { changed: true }>(); - const store = createStore( - { - fetchWorkspaceQuotaState: vi - .fn() - .mockResolvedValueOnce(createQuotaState({ memberCount: 3 })) - .mockResolvedValueOnce(createQuotaState({ memberCount: 4 })), - }, - events$ - ); + test('projects workspace quota state', async () => { + const store = createStore({ + fetchWorkspaceQuotaState: vi + .fn() + .mockResolvedValue(createQuotaState({ memberCount: 3 })), + }); const quota = createEntity(store); quota.revalidate(); await vi.waitFor(() => expect(quota.quota$.value?.memberCount).toBe(3)); expect(quota.quota$.value?.humanReadable.historyPeriod).toBe('30 days'); - - events$.next({ changed: true }); - await vi.waitFor(() => expect(quota.quota$.value?.memberCount).toBe(4)); - - expect(store.fetchWorkspaceQuotaState).toHaveBeenCalledTimes(2); - quota.dispose(); - }); - - test('surfaces realtime quota errors without GraphQL fallback', async () => { - const error = new Error('offline'); - const store = createStore({ - fetchWorkspaceQuotaState: vi.fn().mockRejectedValue(error), - }); - const quota = createEntity(store); - - quota.revalidate(); - - await vi.waitFor(() => expect(quota.error$.value).toBe(error)); - expect(quota.quota$.value).toBeNull(); + expect(store.fetchWorkspaceQuotaState).toHaveBeenCalledWith( + 'workspace-1', + expect.any(AbortSignal) + ); + expect(store.subscribeWorkspaceQuotaState).toHaveBeenCalledWith( + 'workspace-1' + ); quota.dispose(); }); }); diff --git a/packages/frontend/core/src/modules/share-doc/entities/share-info.ts b/packages/frontend/core/src/modules/share-doc/entities/share-info.ts index a9220489c3..1067e692ba 100644 --- a/packages/frontend/core/src/modules/share-doc/entities/share-info.ts +++ b/packages/frontend/core/src/modules/share-doc/entities/share-info.ts @@ -60,8 +60,13 @@ export class ShareInfo extends Entity { } async enableShare(mode: PublicDocMode) { + const { workspace } = this.workspaceService; + await Promise.all([ + workspace.engine.doc.waitForSynced(workspace.id), + workspace.engine.doc.waitForSynced(this.docService.doc.id), + ]); await this.store.enableSharePage( - this.workspaceService.workspace.id, + workspace.id, this.docService.doc.id, mode ); diff --git a/packages/frontend/core/src/modules/share-setting/entities/share-setting.spec.ts b/packages/frontend/core/src/modules/share-setting/entities/share-setting.spec.ts new file mode 100644 index 0000000000..5137508b2b --- /dev/null +++ b/packages/frontend/core/src/modules/share-setting/entities/share-setting.spec.ts @@ -0,0 +1,77 @@ +import type { WorkspaceInviteLinkSnapshot } from '@affine/realtime'; +import { Framework } from '@toeverything/infra'; +import { NEVER } from 'rxjs'; +import { afterEach, expect, test, vi } from 'vitest'; + +import { WorkspaceService } from '../../workspace'; +import { WorkspaceShareSettingStore } from '../stores/share-setting'; +import { WorkspaceShareSetting } from './share-setting'; + +afterEach(() => { + vi.useRealTimers(); +}); + +test.each([1000, 2 ** 31 - 1, 29.5 * 86400000])( + 'keeps the invite link until its actual expiry after %i ms', + async remaining => { + vi.useFakeTimers(); + const setTimeoutSpy = vi.spyOn(globalThis, 'setTimeout'); + vi.setSystemTime(new Date('2026-09-09T00:00:00Z')); + const link: WorkspaceInviteLinkSnapshot = { + link: 'https://example.com/invite', + expireTime: new Date(Date.now() + remaining).toISOString(), + }; + const fetchInviteLink = vi.fn().mockResolvedValue(link); + const framework = new Framework(); + framework + .service(WorkspaceService, { + workspace: { id: 'workspace-1' }, + } as WorkspaceService) + .store(WorkspaceShareSettingStore, { + fetchInviteLink, + subscribeInviteLink: () => NEVER, + subscribeWorkspaceConfig: () => NEVER, + } as unknown as WorkspaceShareSettingStore) + .entity(WorkspaceShareSetting, [ + WorkspaceService, + WorkspaceShareSettingStore, + ]); + const setting = framework.provider().createEntity(WorkspaceShareSetting); + try { + setting.revalidateInviteLink(); + await vi.advanceTimersByTimeAsync(0); + expect(setting.inviteLink$.value).toEqual(link); + expect(setTimeoutSpy).toHaveBeenLastCalledWith( + expect.any(Function), + Math.min(remaining, 2 ** 31 - 1) + ); + await vi.advanceTimersByTimeAsync(remaining - 1); + expect(setting.inviteLink$.value).toEqual(link); + await vi.advanceTimersByTimeAsync(1); + expect(setting.inviteLink$.value).toBeNull(); + expect(vi.getTimerCount()).toBe(0); + + const renewed = { + ...link, + expireTime: new Date(Date.now() + remaining).toISOString(), + }; + fetchInviteLink.mockResolvedValueOnce(renewed); + setting.revalidateInviteLink(); + await vi.advanceTimersByTimeAsync(0); + expect(setting.inviteLink$.value).toEqual(renewed); + fetchInviteLink.mockResolvedValueOnce(null); + setting.revalidateInviteLink(); + await vi.advanceTimersByTimeAsync(0); + expect(vi.getTimerCount()).toBe(0); + expect(setting.inviteLink$.value).toBeNull(); + + fetchInviteLink.mockResolvedValueOnce(renewed); + setting.revalidateInviteLink(); + await vi.advanceTimersByTimeAsync(0); + expect(vi.getTimerCount()).toBe(1); + } finally { + setting.dispose(); + } + expect(vi.getTimerCount()).toBe(0); + } +); diff --git a/packages/frontend/core/src/modules/share-setting/entities/share-setting.ts b/packages/frontend/core/src/modules/share-setting/entities/share-setting.ts index 0445329334..0f0785f626 100644 --- a/packages/frontend/core/src/modules/share-setting/entities/share-setting.ts +++ b/packages/frontend/core/src/modules/share-setting/entities/share-setting.ts @@ -137,9 +137,12 @@ export class WorkspaceShareSetting extends Entity { this.inviteLink$.next(null); return; } - this.inviteLinkExpireTimer = setTimeout(() => { - this.inviteLink$.next(null); - }, delay); + this.inviteLinkExpireTimer = setTimeout( + () => { + this.scheduleInviteLinkExpiry(inviteLink); + }, + Math.min(delay, 2 ** 31 - 1) + ); this.inviteLinkExpireTimer.unref?.(); } diff --git a/packages/frontend/core/src/modules/userspace/entities/user-db-engine.ts b/packages/frontend/core/src/modules/userspace/entities/user-db-engine.ts index 7defa14f08..b7c86c1b7a 100644 --- a/packages/frontend/core/src/modules/userspace/entities/user-db-engine.ts +++ b/packages/frontend/core/src/modules/userspace/entities/user-db-engine.ts @@ -8,7 +8,7 @@ import type { StoreClient } from '@affine/nbstore/worker/client'; import { Entity } from '@toeverything/infra'; import type { ServerService } from '../../cloud'; -import { getSyncProtocol } from '../../cloud/stores/server-config'; +import { assertSupportedServerVersion } from '../../cloud/stores/server-config'; import type { NbstoreService } from '../../storage'; export class UserDBEngine extends Entity<{ @@ -36,7 +36,7 @@ export class UserDBEngine extends Entity<{ serverService: ServerService ) { super(); - + assertSupportedServerVersion(serverService.server.config$.value.version); const { store, dispose } = this.nbstoreService.openStore( `userspace:${serverService.server.id},${this.userId}`, { @@ -65,9 +65,6 @@ export class UserDBEngine extends Entity<{ opts: { id: this.userId, serverBaseUrl: serverService.server.baseUrl, - syncProtocol: getSyncProtocol( - serverService.server.config$.value.version - ), type: 'userspace', isSelfHosted: serverService.server.config$.value.type === diff --git a/packages/frontend/core/src/modules/workspace-engine/impls/cloud.ts b/packages/frontend/core/src/modules/workspace-engine/impls/cloud.ts index def54f991e..a4fb836db6 100644 --- a/packages/frontend/core/src/modules/workspace-engine/impls/cloud.ts +++ b/packages/frontend/core/src/modules/workspace-engine/impls/cloud.ts @@ -8,6 +8,7 @@ import { ServerFeature, } from '@affine/graphql'; import type { + BlobSource, BlobStorage, DocStorage, ListedBlobRecord, @@ -66,7 +67,7 @@ import { GraphQLService, WorkspaceServerService, } from '../../cloud'; -import { getSyncProtocol } from '../../cloud/stores/server-config'; +import { assertSupportedServerVersion } from '../../cloud/stores/server-config'; import { type GlobalState, NbstoreService } from '../../storage'; import type { Workspace, @@ -381,7 +382,15 @@ class CloudWorkspaceFlavourProvider implements WorkspaceFlavourProvider { }; } - async getWorkspaceBlob(id: string, blob: string): Promise { + async getWorkspaceBlob( + id: string, + blob: string, + source: BlobSource = { + type: 'currentDoc', + workspaceId: id, + docId: id, + } + ): Promise { const storage = new this.BlobStorageType({ id: id, flavour: this.flavour, @@ -389,9 +398,9 @@ class CloudWorkspaceFlavourProvider implements WorkspaceFlavourProvider { }); storage.connection.connect(); await storage.connection.waitForConnected(); - const localBlob = await storage.get(blob); - - storage.connection.disconnect(); + const localBlob = await storage + .get(blob) + .finally(() => storage.connection.disconnect()); if (localBlob) { return new Blob([toArrayBuffer(localBlob.data)], { @@ -399,25 +408,62 @@ class CloudWorkspaceFlavourProvider implements WorkspaceFlavourProvider { }); } - const cloudBlob = await new CloudBlobStorage({ - id, - serverBaseUrl: this.server.serverMetadata.baseUrl, - }).get(blob); - if (!cloudBlob) { - return null; + const sourceSession = this.openWorkspaceBlobSource(id, source); + try { + return await sourceSession.get(blob); + } finally { + await sourceSession.close(); } - return new Blob([toArrayBuffer(cloudBlob.data)], { type: cloudBlob.mime }); } - async listBlobs(id: string): Promise { + openWorkspaceBlobSource(id: string, source: BlobSource) { const cloudStorage = new CloudBlobStorage({ id, serverBaseUrl: this.server.serverMetadata.baseUrl, }); - return cloudStorage.list(); + let ready: Promise | undefined; + let registered = false; + let closed = false; + return { + get: async (blob: string) => { + if (closed) throw new Error('Workspace blob source is closed'); + if (!ready) { + registered = true; + const registration = cloudStorage.registerSource(source); + ready = registration; + try { + await registration; + } catch (error) { + if (ready === registration) ready = undefined; + throw error; + } + } else { + await ready; + } + const cloudBlob = await cloudStorage.get(blob, undefined, source); + return cloudBlob + ? new Blob([toArrayBuffer(cloudBlob.data)], { + type: cloudBlob.mime, + }) + : null; + }, + close: async () => { + if (closed) return; + closed = true; + if (registered) await cloudStorage.unregisterSource(source); + }, + }; } - async deleteBlob( + async listManageableBlobs(id: string): Promise { + const cloudStorage = new CloudBlobStorage({ + id, + serverBaseUrl: this.server.serverMetadata.baseUrl, + }); + return cloudStorage.listManageable(); + } + + async deleteManagedBlob( id: string, blob: string, permanent: boolean @@ -455,6 +501,7 @@ class CloudWorkspaceFlavourProvider implements WorkspaceFlavourProvider { } getEngineWorkerInitOptions(workspaceId: string): WorkerInitOptions { + assertSupportedServerVersion(this.server.config$.value.version); return { local: { doc: { @@ -520,7 +567,6 @@ class CloudWorkspaceFlavourProvider implements WorkspaceFlavourProvider { type: 'workspace', id: workspaceId, serverBaseUrl: this.server.serverMetadata.baseUrl, - syncProtocol: getSyncProtocol(this.server.config$.value.version), isSelfHosted: this.server.config$.value.type === ServerDeploymentType.Selfhosted, @@ -539,7 +585,6 @@ class CloudWorkspaceFlavourProvider implements WorkspaceFlavourProvider { type: 'workspace', id: workspaceId, serverBaseUrl: this.server.serverMetadata.baseUrl, - syncProtocol: getSyncProtocol(this.server.config$.value.version), isSelfHosted: this.server.config$.value.type === ServerDeploymentType.Selfhosted, diff --git a/packages/frontend/core/src/modules/workspace-engine/impls/local.ts b/packages/frontend/core/src/modules/workspace-engine/impls/local.ts index 21104b760b..33a3c6611e 100644 --- a/packages/frontend/core/src/modules/workspace-engine/impls/local.ts +++ b/packages/frontend/core/src/modules/workspace-engine/impls/local.ts @@ -1,6 +1,7 @@ import { toArrayBuffer } from '@affine/core/utils/array-buffer'; import { DebugLogger } from '@affine/debug'; import { + type BlobSource, type BlobStorage, type DocStorage, type ListedBlobRecord, @@ -388,7 +389,11 @@ class LocalWorkspaceFlavourProvider implements WorkspaceFlavourProvider { }; } - async getWorkspaceBlob(id: string, blobKey: string): Promise { + async getWorkspaceBlob( + id: string, + blobKey: string, + _source?: BlobSource + ): Promise { const storage = new this.BlobStorageType({ id: id, flavour: this.flavour, @@ -402,7 +407,7 @@ class LocalWorkspaceFlavourProvider implements WorkspaceFlavourProvider { : null; } - async listBlobs(id: string): Promise { + async listManageableBlobs(id: string): Promise { const storage = new this.BlobStorageType({ id: id, flavour: this.flavour, @@ -414,7 +419,7 @@ class LocalWorkspaceFlavourProvider implements WorkspaceFlavourProvider { return storage.list(); } - async deleteBlob( + async deleteManagedBlob( id: string, blob: string, permanent: boolean diff --git a/packages/frontend/core/src/modules/workspace/entities/workspace.ts b/packages/frontend/core/src/modules/workspace/entities/workspace.ts index f81e77b5b8..e444d64236 100644 --- a/packages/frontend/core/src/modules/workspace/entities/workspace.ts +++ b/packages/frontend/core/src/modules/workspace/entities/workspace.ts @@ -1,5 +1,6 @@ import type { FeatureFlagService } from '@affine/core/modules/feature-flag'; import { toArrayBuffer } from '@affine/core/utils/array-buffer'; +import { DebugLogger } from '@affine/debug'; import type { Workspace as WorkspaceInterface } from '@blocksuite/affine/store'; import { Entity, LiveData, yjsGetPath } from '@toeverything/infra'; import type { Observable } from 'rxjs'; @@ -10,6 +11,9 @@ import { WorkspaceImpl } from '../impls/workspace'; import type { WorkspaceScope } from '../scopes/workspace'; import { WorkspaceEngineService } from '../services/engine'; +const BLOB_SOURCE_REFRESH_DELAY = 250; +const logger = new DebugLogger('affine:workspace-blob-source'); + export class Workspace extends Entity { constructor( public readonly scope: WorkspaceScope, @@ -30,6 +34,47 @@ export class Workspace extends Entity { _docCollection: WorkspaceInterface | null = null; + private readonly blobSourceUpdateCleanups = new WeakMap void>(); + + private loadBlobSource(doc: YDoc) { + this.blobSourceUpdateCleanups.get(doc)?.(); + const source = { + type: 'currentDoc' as const, + workspaceId: this.id, + docId: doc.guid, + }; + let refreshTimer: ReturnType | undefined; + const refresh = () => { + if (refreshTimer) return; + refreshTimer = setTimeout(() => { + refreshTimer = undefined; + this.engine.blob + .registerSource(source) + .catch(error => logger.error('Failed to refresh blob source', error)); + }, BLOB_SOURCE_REFRESH_DELAY); + }; + doc.on('update', refresh); + this.blobSourceUpdateCleanups.set(doc, () => { + doc.off('update', refresh); + if (refreshTimer) clearTimeout(refreshTimer); + this.blobSourceUpdateCleanups.delete(doc); + }); + this.engine.blob + .registerSource(source) + .catch(error => logger.error('Failed to register blob source', error)); + } + + private unloadBlobSource(doc: YDoc) { + this.blobSourceUpdateCleanups.get(doc)?.(); + this.engine.blob + .unregisterSource({ + type: 'currentDoc', + workspaceId: this.id, + docId: doc.guid, + }) + .catch(error => logger.error('Failed to unregister blob source', error)); + } + get docCollection() { if (!this._docCollection) { this._docCollection = new WorkspaceImpl({ @@ -62,7 +107,13 @@ export class Workspace extends Entity { name: 'blob', readonly: false, }, - onLoadDoc: doc => this.engine.doc.connectDoc(doc), + onLoadDoc: doc => { + this.loadBlobSource(doc); + this.engine.doc.connectDoc(doc); + }, + onUnloadDoc: doc => { + this.unloadBlobSource(doc); + }, onLoadAwareness: awareness => this.engine.awareness.connectAwareness(awareness), onCreateDoc: docId => diff --git a/packages/frontend/core/src/modules/workspace/impls/doc.ts b/packages/frontend/core/src/modules/workspace/impls/doc.ts index 26118d6320..b94ba7f9a6 100644 --- a/packages/frontend/core/src/modules/workspace/impls/doc.ts +++ b/packages/frontend/core/src/modules/workspace/impls/doc.ts @@ -117,6 +117,9 @@ export class DocImpl implements Doc { } private _destroy() { + if (this._loaded) { + this.workspace.onUnloadDoc?.(this._ySpaceDoc); + } this.awarenessStore.destroy(); this._ySpaceDoc.destroy(); this._loaded = false; diff --git a/packages/frontend/core/src/modules/workspace/impls/workspace.ts b/packages/frontend/core/src/modules/workspace/impls/workspace.ts index 1b276c5492..0439a9f0fd 100644 --- a/packages/frontend/core/src/modules/workspace/impls/workspace.ts +++ b/packages/frontend/core/src/modules/workspace/impls/workspace.ts @@ -28,6 +28,7 @@ type WorkspaceOptions = { rootDoc: YDoc; blobSource?: BlobSource; onLoadDoc?: (doc: YDoc) => void; + onUnloadDoc?: (doc: YDoc) => void; onLoadAwareness?: (awareness: Awareness) => void; onCreateDoc?: (docId?: string) => string; featureFlagService?: FeatureFlagService; @@ -55,6 +56,7 @@ export class WorkspaceImpl implements Workspace { } readonly onLoadDoc?: (doc: YDoc) => void; + readonly onUnloadDoc?: (doc: YDoc) => void; readonly onLoadAwareness?: (awareness: Awareness) => void; readonly onCreateDoc?: (docId?: string) => string; readonly featureFlagService?: FeatureFlagService; @@ -64,6 +66,7 @@ export class WorkspaceImpl implements Workspace { rootDoc, blobSource, onLoadDoc, + onUnloadDoc, onLoadAwareness, onCreateDoc, featureFlagService, @@ -72,6 +75,7 @@ export class WorkspaceImpl implements Workspace { this.featureFlagService = featureFlagService; this.doc = rootDoc; this.onLoadDoc = onLoadDoc; + this.onUnloadDoc = onUnloadDoc; this.onLoadDoc?.(this.doc); this.onLoadAwareness = onLoadAwareness; this.onCreateDoc = onCreateDoc; @@ -174,5 +178,6 @@ export class WorkspaceImpl implements Workspace { dispose() { this.blockCollections.forEach(doc => doc.dispose()); + this.onUnloadDoc?.(this.doc); } } diff --git a/packages/frontend/core/src/modules/workspace/providers/flavour.ts b/packages/frontend/core/src/modules/workspace/providers/flavour.ts index f08e3a58c9..99304b121d 100644 --- a/packages/frontend/core/src/modules/workspace/providers/flavour.ts +++ b/packages/frontend/core/src/modules/workspace/providers/flavour.ts @@ -1,4 +1,5 @@ import type { + BlobSource, BlobStorage, DocStorage, ListedBlobRecord, @@ -11,6 +12,11 @@ import type { WorkspaceProfileInfo } from '../entities/profile'; import type { Workspace } from '../entities/workspace'; import type { WorkspaceMetadata } from '../metadata'; +export interface WorkspaceBlobSourceSession { + close(): Promise; + get(blob: string): Promise; +} + export interface WorkspaceFlavourProvider { flavour: string; @@ -43,11 +49,20 @@ export interface WorkspaceFlavourProvider { signal?: AbortSignal ): Promise; - getWorkspaceBlob(id: string, blob: string): Promise; + getWorkspaceBlob( + id: string, + blob: string, + source?: BlobSource + ): Promise; - listBlobs(workspaceId: string): Promise; + openWorkspaceBlobSource?( + id: string, + source: BlobSource + ): WorkspaceBlobSourceSession; - deleteBlob( + listManageableBlobs(workspaceId: string): Promise; + + deleteManagedBlob( workspaceId: string, blob: string, permanent: boolean diff --git a/packages/frontend/electron-api/package.json b/packages/frontend/electron-api/package.json index aa29971dad..89724ff863 100644 --- a/packages/frontend/electron-api/package.json +++ b/packages/frontend/electron-api/package.json @@ -1,6 +1,6 @@ { "name": "@affine/electron-api", - "version": "0.27.0", + "version": "0.27.5", "type": "module", "private": true, "main": "./src/index.ts", diff --git a/packages/frontend/i18n/package.json b/packages/frontend/i18n/package.json index ef190e50cc..346be2bfc7 100644 --- a/packages/frontend/i18n/package.json +++ b/packages/frontend/i18n/package.json @@ -1,6 +1,6 @@ { "name": "@affine/i18n", - "version": "0.27.0", + "version": "0.27.5", "description": "", "type": "module", "private": true, diff --git a/packages/frontend/native/package.json b/packages/frontend/native/package.json index fa6502be0d..bdf523a18e 100644 --- a/packages/frontend/native/package.json +++ b/packages/frontend/native/package.json @@ -43,5 +43,5 @@ "test": "ava --no-worker-threads --concurrency=2", "version": "napi version" }, - "version": "0.27.0" + "version": "0.27.5" } diff --git a/packages/frontend/routes/package.json b/packages/frontend/routes/package.json index 4bf13eddc1..502655371b 100644 --- a/packages/frontend/routes/package.json +++ b/packages/frontend/routes/package.json @@ -1,6 +1,6 @@ { "name": "@affine/routes", - "version": "0.27.0", + "version": "0.27.5", "private": true, "type": "module", "exports": { diff --git a/packages/frontend/templates/package.json b/packages/frontend/templates/package.json index bb1dafa1f7..54bb8ad880 100644 --- a/packages/frontend/templates/package.json +++ b/packages/frontend/templates/package.json @@ -2,7 +2,7 @@ "name": "@affine/templates", "private": true, "sideEffect": false, - "version": "0.27.0", + "version": "0.27.5", "scripts": { "build": "node ./build-edgeless.mjs && node ./build-stickers.mjs", "postinstall": "yarn build" diff --git a/packages/frontend/track/package.json b/packages/frontend/track/package.json index fda35ebb0a..f014f6e6af 100644 --- a/packages/frontend/track/package.json +++ b/packages/frontend/track/package.json @@ -2,7 +2,7 @@ "name": "@affine/track", "type": "module", "private": true, - "version": "0.27.0", + "version": "0.27.5", "exports": { ".": "./src/index.ts" }, diff --git a/tests/affine-cloud-copilot/package.json b/tests/affine-cloud-copilot/package.json index 28d340f673..ab5c4b9340 100644 --- a/tests/affine-cloud-copilot/package.json +++ b/tests/affine-cloud-copilot/package.json @@ -9,5 +9,5 @@ "@affine-test/kit": "workspace:*", "@playwright/test": "=1.58.2" }, - "version": "0.27.0" + "version": "0.27.5" } diff --git a/tests/affine-cloud/e2e/storage.spec.ts b/tests/affine-cloud/e2e/storage.spec.ts index ae167c5f86..466be19d7a 100644 --- a/tests/affine-cloud/e2e/storage.spec.ts +++ b/tests/affine-cloud/e2e/storage.spec.ts @@ -27,7 +27,9 @@ test.afterEach(async () => { await deleteUser(user.email); }); -test('should show blob management dialog', async ({ page }) => { +test('should delete unused blobs after permanently deleting a doc', async ({ + page, +}) => { await enableCloudWorkspace(page); await clickSideBarAllPageButton(page); @@ -40,18 +42,32 @@ test('should show blob management dialog', async ({ page }) => { await deleteBtn.click(); await expect(page.getByText('Delete doc?')).toBeVisible(); await page.getByRole('button', { name: 'Delete' }).click(); + await page.getByTestId('trash-page').click(); + await getPageByTitle(page, 'Getting Started') + .getByTestId('delete-page-button') + .click(); + const confirmDelete = page.getByRole('dialog', { + name: 'Delete permanently?', + }); + await expect(confirmDelete).toBeVisible(); + await confirmDelete + .getByRole('button', { name: 'Delete', exact: true }) + .click(); + await expect(getPageByTitle(page, 'Getting Started')).toBeHidden(); await page.getByTestId('slider-bar-workspace-setting-button').click(); await expect(page.getByTestId('setting-modal')).toBeVisible(); await page.getByTestId('workspace-setting:storage').click(); - await expect(page.getByTestId('blob-preview-card')).toHaveCount(9); + await expect(page.getByText(/Unused blobs \([1-9]\d*\)/)).toBeVisible(); // get the unused blobs count const count = await page.getByText(/Unused blobs \(\d+\)/).textContent(); const unusedBlobsCount = parseInt(count?.match(/\d+/)?.[0] ?? '0'); - // count should > 9 - expect(unusedBlobsCount).toBeGreaterThan(9); + expect(unusedBlobsCount).toBeGreaterThan(0); + await expect(page.getByTestId('blob-preview-card')).toHaveCount( + Math.min(9, unusedBlobsCount) + ); await page.getByTestId('blob-preview-card').nth(0).click(); await expect(page.getByText('1 Selected')).toBeVisible(); diff --git a/tests/affine-cloud/package.json b/tests/affine-cloud/package.json index ae1f45060a..a0e3720c82 100644 --- a/tests/affine-cloud/package.json +++ b/tests/affine-cloud/package.json @@ -9,5 +9,5 @@ "@affine-test/kit": "workspace:*", "@playwright/test": "=1.58.2" }, - "version": "0.27.0" + "version": "0.27.5" } diff --git a/tests/affine-desktop-cloud/package.json b/tests/affine-desktop-cloud/package.json index dfac9047f4..e4e51684a9 100644 --- a/tests/affine-desktop-cloud/package.json +++ b/tests/affine-desktop-cloud/package.json @@ -9,5 +9,5 @@ "@affine-test/kit": "workspace:*", "@playwright/test": "=1.58.2" }, - "version": "0.27.0" + "version": "0.27.5" } diff --git a/tests/affine-desktop/package.json b/tests/affine-desktop/package.json index 5529413bc5..9bad033fce 100644 --- a/tests/affine-desktop/package.json +++ b/tests/affine-desktop/package.json @@ -13,5 +13,5 @@ "fs-extra": "^11.2.0", "playwright": "=1.58.2" }, - "version": "0.27.0" + "version": "0.27.5" } diff --git a/tests/affine-local/package.json b/tests/affine-local/package.json index e7afbe3bf7..b878413323 100644 --- a/tests/affine-local/package.json +++ b/tests/affine-local/package.json @@ -9,5 +9,5 @@ "@affine-test/kit": "workspace:*", "@playwright/test": "=1.58.2" }, - "version": "0.27.0" + "version": "0.27.5" } diff --git a/tests/affine-mobile/package.json b/tests/affine-mobile/package.json index 60262e8cd4..77180be726 100644 --- a/tests/affine-mobile/package.json +++ b/tests/affine-mobile/package.json @@ -9,5 +9,5 @@ "@affine-test/kit": "workspace:*", "@playwright/test": "=1.58.2" }, - "version": "0.27.0" + "version": "0.27.5" } diff --git a/tests/blocksuite/package.json b/tests/blocksuite/package.json index 2450a6cbc5..ce30e98482 100644 --- a/tests/blocksuite/package.json +++ b/tests/blocksuite/package.json @@ -13,5 +13,5 @@ "@toeverything/theme": "^1.1.23", "json-stable-stringify": "^1.2.1" }, - "version": "0.27.0" + "version": "0.27.5" } diff --git a/tests/kit/package.json b/tests/kit/package.json index 1aff1e91f4..55452a4943 100644 --- a/tests/kit/package.json +++ b/tests/kit/package.json @@ -2,7 +2,7 @@ "name": "@affine-test/kit", "private": true, "type": "module", - "version": "0.27.0", + "version": "0.27.5", "exports": { "./electron": "./src/electron.ts", "./mobile": "./src/mobile.ts", diff --git a/tests/kit/src/utils/cloud.ts b/tests/kit/src/utils/cloud.ts index 4295633fcb..db86fdacdf 100644 --- a/tests/kit/src/utils/cloud.ts +++ b/tests/kit/src/utils/cloud.ts @@ -359,4 +359,8 @@ export async function enableShare(page: Page) { // wait for the menu to be visible await page.waitForTimeout(500); await page.getByTestId('share-link-menu-enable-share').click(); + await expect(page.getByTestId('share-link-menu-trigger')).toHaveText( + 'Read only', + { timeout: 30_000 } + ); } diff --git a/tools/@types/assets/package.json b/tools/@types/assets/package.json index 8c12fe1537..9b0291547c 100644 --- a/tools/@types/assets/package.json +++ b/tools/@types/assets/package.json @@ -3,5 +3,5 @@ "private": true, "types": "./__all.d.ts", "type": "module", - "version": "0.27.0" + "version": "0.27.5" } diff --git a/tools/@types/build-config/package.json b/tools/@types/build-config/package.json index f95671bb97..6aa9c62520 100644 --- a/tools/@types/build-config/package.json +++ b/tools/@types/build-config/package.json @@ -3,5 +3,5 @@ "private": true, "types": "./__all.d.ts", "type": "module", - "version": "0.27.0" + "version": "0.27.5" } diff --git a/tools/@types/env/package.json b/tools/@types/env/package.json index 2e6d79dc03..2432023843 100644 --- a/tools/@types/env/package.json +++ b/tools/@types/env/package.json @@ -7,5 +7,5 @@ "@affine/env": "workspace:*", "@blocksuite/affine": "workspace:*" }, - "version": "0.27.0" + "version": "0.27.5" } diff --git a/tools/changelog/package.json b/tools/changelog/package.json index 197b90ba25..2204993e9e 100644 --- a/tools/changelog/package.json +++ b/tools/changelog/package.json @@ -1,6 +1,6 @@ { "name": "@affine/changelog", - "version": "0.27.0", + "version": "0.27.5", "type": "module", "main": "index.js", "private": true, diff --git a/tools/cli/package.json b/tools/cli/package.json index 9c7120b359..36a4732a17 100644 --- a/tools/cli/package.json +++ b/tools/cli/package.json @@ -1,6 +1,6 @@ { "name": "@affine-tools/cli", - "version": "0.27.0", + "version": "0.27.5", "type": "module", "private": true, "bin": { diff --git a/tools/commitlint/package.json b/tools/commitlint/package.json index 24ff9626d4..e83859224d 100644 --- a/tools/commitlint/package.json +++ b/tools/commitlint/package.json @@ -1,6 +1,6 @@ { "name": "@affine/commitlint-config", - "version": "0.27.0", + "version": "0.27.5", "private": true, "devDependencies": { "@commitlint/cli": "^19.8.1", diff --git a/tools/copilot-result/package.json b/tools/copilot-result/package.json index af4107bf1e..ee44d8b4a8 100644 --- a/tools/copilot-result/package.json +++ b/tools/copilot-result/package.json @@ -1,6 +1,6 @@ { "name": "@affine/copilot-result", - "version": "0.27.0", + "version": "0.27.5", "type": "module", "main": "index.js", "private": true, diff --git a/tools/doc-diff/package.json b/tools/doc-diff/package.json index cdb434590b..416238e1b3 100644 --- a/tools/doc-diff/package.json +++ b/tools/doc-diff/package.json @@ -1,6 +1,6 @@ { "name": "@affine/doc-diff", - "version": "0.27.0", + "version": "0.27.5", "private": true, "type": "module", "description": "Diff AFFiNE Yjs snapshot docs (rootdoc/folder/favorite)", diff --git a/tools/playstore-auto-bump/package.json b/tools/playstore-auto-bump/package.json index b5bd99e02a..a39a874a9c 100644 --- a/tools/playstore-auto-bump/package.json +++ b/tools/playstore-auto-bump/package.json @@ -1,6 +1,6 @@ { "name": "@affine/playstore-auto-bump", - "version": "0.27.0", + "version": "0.27.5", "private": true, "type": "module", "description": "Automatically bump the versionCode and versionName of an Android app from the Google Play Store versions", diff --git a/tools/revert-update/package.json b/tools/revert-update/package.json index f7c1c3feb3..cdbd64b052 100644 --- a/tools/revert-update/package.json +++ b/tools/revert-update/package.json @@ -1,6 +1,6 @@ { "name": "@affine/revert-update", - "version": "0.27.0", + "version": "0.27.5", "private": true, "type": "module", "description": "Generate a revert update from two Yjs snapshot binaries", diff --git a/tools/utils/package.json b/tools/utils/package.json index 7885177060..78c3563183 100644 --- a/tools/utils/package.json +++ b/tools/utils/package.json @@ -1,6 +1,6 @@ { "name": "@affine-tools/utils", - "version": "0.27.0", + "version": "0.27.5", "type": "module", "private": true, "exports": {