From 047537101c66c835e8da2cf2e0efd7a7a08c8266 Mon Sep 17 00:00:00 2001 From: JimmFly Date: Mon, 9 Jan 2023 14:55:38 +0800 Subject: [PATCH 01/33] feat: extract i18n into a package --- packages/app/package.json | 3 +- packages/app/src/libs/i18n/resources/bn.json | 22 ------- packages/app/src/libs/i18n/resources/fr.json | 29 --------- packages/app/src/libs/i18n/resources/sr.json | 27 -------- .../app/src/libs/i18n/resources/zh-Hans.json | 29 --------- .../app/src/libs/i18n/resources/zh-Hant.json | 29 --------- packages/i18n/package.json | 27 ++++++++ .../{app/src/libs/i18n => i18n/src}/index.ts | 12 ++-- packages/i18n/src/resources/bn.json | 1 + .../libs/i18n => i18n/src}/resources/en.json | 20 +++++- packages/i18n/src/resources/fr.json | 1 + .../libs/i18n => i18n/src}/resources/index.ts | 0 packages/i18n/src/resources/sr.json | 1 + packages/i18n/src/resources/zh-Hans.json | 65 +++++++++++++++++++ packages/i18n/src/resources/zh-Hant.json | 1 + .../i18n => packages/i18n/src/script}/api.ts | 0 .../i18n/src/script}/download.ts | 0 .../i18n/src/script}/request.ts | 0 .../i18n => packages/i18n/src/script}/sync.ts | 0 .../i18n/src/script}/utils.ts | 0 packages/i18n/tsconfig.json | 25 +++++++ pnpm-lock.yaml | 50 ++++++++------ 22 files changed, 172 insertions(+), 170 deletions(-) delete mode 100644 packages/app/src/libs/i18n/resources/bn.json delete mode 100644 packages/app/src/libs/i18n/resources/fr.json delete mode 100644 packages/app/src/libs/i18n/resources/sr.json delete mode 100644 packages/app/src/libs/i18n/resources/zh-Hans.json delete mode 100644 packages/app/src/libs/i18n/resources/zh-Hant.json create mode 100644 packages/i18n/package.json rename packages/{app/src/libs/i18n => i18n/src}/index.ts (86%) create mode 100644 packages/i18n/src/resources/bn.json rename packages/{app/src/libs/i18n => i18n/src}/resources/en.json (72%) create mode 100644 packages/i18n/src/resources/fr.json rename packages/{app/src/libs/i18n => i18n/src}/resources/index.ts (100%) create mode 100644 packages/i18n/src/resources/sr.json create mode 100644 packages/i18n/src/resources/zh-Hans.json create mode 100644 packages/i18n/src/resources/zh-Hant.json rename {scripts/i18n => packages/i18n/src/script}/api.ts (100%) rename {scripts/i18n => packages/i18n/src/script}/download.ts (100%) rename {scripts/i18n => packages/i18n/src/script}/request.ts (100%) rename {scripts/i18n => packages/i18n/src/script}/sync.ts (100%) rename {scripts/i18n => packages/i18n/src/script}/utils.ts (100%) create mode 100644 packages/i18n/tsconfig.json diff --git a/packages/app/package.json b/packages/app/package.json index 16fd889fd7..aece2897f9 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -10,6 +10,7 @@ }, "dependencies": { "@affine/datacenter": "workspace:*", + "@affine/i18n": "workspace:*", "@blocksuite/blocks": "0.3.1-20230109032243-37ad3ba", "@blocksuite/editor": "0.3.1-20230109032243-37ad3ba", "@blocksuite/icons": "^2.0.2", @@ -27,7 +28,6 @@ "cmdk": "^0.1.20", "css-spring": "^4.1.0", "dayjs": "^1.11.7", - "i18next": "^21.9.1", "lit": "^2.3.1", "next": "13.1.0", "next-debug-local": "^0.1.5", @@ -36,7 +36,6 @@ "quill-cursors": "^4.0.0", "react": "18.2.0", "react-dom": "18.2.0", - "react-i18next": "^11.18.4", "yjs": "^13.5.44" }, "devDependencies": { diff --git a/packages/app/src/libs/i18n/resources/bn.json b/packages/app/src/libs/i18n/resources/bn.json deleted file mode 100644 index 5eb50f8cdf..0000000000 --- a/packages/app/src/libs/i18n/resources/bn.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "// THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.": "", - "Add A Below Block": "নীচে একটি ব্লক যোগ করুন", - "WarningTips": { - "IsNotfsApiSupported": "অ্যাফাইন ডেমোতে স্বাগতম। পরিবর্তনগুলি সংরক্ষণ করা শুরু করতে আপনি Chrome/Edge এর মতো ক্রোমিয়াম ভিত্তিক ব্রাউজারের সর্বশেষ সংস্করণের মাধ্যমে ডিস্কে ডেটা সিঙ্ক করতে পারেন", - "DoNotStore": "অ্যাফাইন সক্রিয় ডেভেলপমেন্ট এর অধীনে এবং বর্তমান সংস্করণটি অস্থিতিশীল। দয়া করে কোন তথ্য বা ডেটা সঞ্চয় করবেন না" - }, - "Language": "ভাষা", - "Settings": "সেটিংস", - "Share": "শেয়ার করুন", - "Comment": "মন্তব্য", - "Delete": "মুছে ফেলুন", - "Copy Page Link": "পেজ লিংক কপি করুন", - "Duplicate Page": "সদৃশ পৃষ্ঠা তৈরি করুন", - "Logout": "লগআউট", - "Divide Here As A New Group": "একটি নতুন গ্রুপ হিসেবে বিভক্ত করুন", - "ComingSoon": "লেআউট সেটিংস শীঘ্রই আসছে...", - "Clear Workspace": "ওয়ার্কস্পেস পরিষ্কার করুন", - "Layout": "লেআউট", - "Turn into": "রূপান্তর করুন", - "Sync to Disk": "ডিস্ক এ সিঙ্ক করুন" -} diff --git a/packages/app/src/libs/i18n/resources/fr.json b/packages/app/src/libs/i18n/resources/fr.json deleted file mode 100644 index d30fdcb133..0000000000 --- a/packages/app/src/libs/i18n/resources/fr.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "// THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.": "", - "ComingSoon": "Bientôt disponible", - "Duplicate Page": "Dupliquer la page", - "Copy Page Link": "Copier le lien de la page", - "Delete": "Supprimer", - "Comment": "Commentaire", - "Export As HTML": "Exporter en HTML", - "Export As Markdown": "Exporter en Markdown", - "Export As PDF (Unsupported)": "exporter en PDF (non supporté)", - "Logout": "Déconnexion", - "Export Workspace": "Exporter l'espace de travail", - "Import Workspace": "Importer l'espace de travail", - "Language": "Langue", - "Last edited by": "Dernière édition par {{name}}", - "Layout": "Mise en forme", - "Settings": "Réglages", - "Share": "Partager", - "Sync to Disk": "Synchroniser sur le disque", - "Turn into": "Transformer en", - "WarningTips": { - "DoNotStore": "Affine est en développement actif ; la version actuelle est INSTABLE. Veuillez NE PAS stocker d'informations ou de données", - "IsNotLocalWorkspace": "Bienvenue sur la démo d'AFFiNE. Pour commencer à sauvegarder vos modifications, vous pouvez SYNCHRONISER SUR LE DISQUE", - "IsNotfsApiSupported": "Bienvenue sur la démo d'AFFiNE. Pour commencer à sauvegarder vos modifications, vous pouvez SYNCHRONISER SUR LE DISQUE\navec la dernière version d'un navigateur basé sur Chromium tel que Chrome ou Edge." - }, - "Add A Below Block": "Ajouter un bloc en-dessous", - "Divide Here As A New Group": "Séparer ici en un nouveau groupe", - "Clear Workspace": "Vider l'espace de travail" -} diff --git a/packages/app/src/libs/i18n/resources/sr.json b/packages/app/src/libs/i18n/resources/sr.json deleted file mode 100644 index edc6c32f2c..0000000000 --- a/packages/app/src/libs/i18n/resources/sr.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "// THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.": "", - "Clear Workspace": "Očisti radni prostor", - "ComingSoon": "Podešavanja za izgled dolaze", - "Comment": "Komentar", - "Copy Page Link": "Kopiraj link stranice", - "Delete": "Obriši", - "Duplicate Page": "Dupliraj stranicu", - "Export As HTML": "Izvezi kao HTML", - "Export As Markdown": "Izvezi kao Markdown", - "Export As PDF (Unsupported)": "Izvezi kao PDF (nepodržano)", - "Export Workspace": "Izvezi radnu površinu", - "Import Workspace": "Poboljšaj radnu površinu", - "Language": "Jezik", - "Last edited by": "Zadnju promenu uradio {{ime}}", - "Layout": "Izgled", - "Logout": "Odjava", - "Settings": "Podešavanja", - "Share": "Podeli", - "Sync to Disk": "Sinhroniziraj sa diskom", - "Turn into": "Promeni u", - "WarningTips": { - "DoNotStore": "AFFiNE je u stanju aktivnog razvoja i trenutna verzija je NESTABILNA. Molimo vas, NEMOJTE čuvati informacije ili podatke.", - "IsNotLocalWorkspace": "Dobrodošli u AFFiNE demo. Da bi započeli proces čuvanja promena možete kliknuti SINHRONIZUJ SA DISKOM.", - "IsNotfsApiSupported": "Dobrodošli u AFFiNE demo. Da bi započeli proces čuvanja promena možete SINHRONIZOVATI NA DISK sa poslednjom verzijom pretraživača tipa Chromium, kao što su Chrome/Edge." - } -} diff --git a/packages/app/src/libs/i18n/resources/zh-Hans.json b/packages/app/src/libs/i18n/resources/zh-Hans.json deleted file mode 100644 index 14786dcb7e..0000000000 --- a/packages/app/src/libs/i18n/resources/zh-Hans.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "// THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.": "", - "Sync to Disk": "同步到磁盘", - "Share": "分享", - "WarningTips": { - "IsNotfsApiSupported": "欢迎来到AFFiNE 的演示界面。您可以使用最新版本的基于Chrome的浏览器（如Chrome/Edge）将数据同步到磁盘来进行保存", - "IsNotLocalWorkspace": "欢迎来到AFFiNE 的演示界面，您可以同步到磁盘来进行保存操作。", - "DoNotStore": "AFFiNE 正在积极开发中，当前版本不稳定。请不要存储信息或数据。" - }, - "ComingSoon": "布局设置即将到来", - "Layout": "布局", - "Comment": "评论", - "Settings": "设置", - "Duplicate Page": "复制页面", - "Copy Page Link": "复制页面链接", - "Language": "当前语言", - "Clear Workspace": "清空工作区域", - "Export As Markdown": "导出 markdown", - "Export As HTML": "导出 HTML", - "Export As PDF (Unsupported)": "导出 PDF (暂不支持)", - "Import Workspace": "导入 Workspace", - "Export Workspace": "导出 Workspace", - "Last edited by": "最后编辑者为 {{name}}", - "Logout": "退出登录", - "Delete": "删除", - "Turn into": "转换为", - "Add A Below Block": "在下方添加一个新块", - "Divide Here As A New Group": "从这里划分一个新组" -} diff --git a/packages/app/src/libs/i18n/resources/zh-Hant.json b/packages/app/src/libs/i18n/resources/zh-Hant.json deleted file mode 100644 index 4d0f28c9cd..0000000000 --- a/packages/app/src/libs/i18n/resources/zh-Hant.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "// THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.": "", - "Add A Below Block": "在下方新添塊", - "Clear Workspace": "清空工作區", - "ComingSoon": "自定義佈局功能即將與您見面", - "Comment": "評論", - "Copy Page Link": "拷貝頁面鏈接", - "Delete": "刪除", - "Divide Here As A New Group": "從此地劃分成新組", - "Duplicate Page": "複製界面", - "Export As HTML": "導出 HTML", - "Export As Markdown": "以 Markdown 導出", - "Export As PDF (Unsupported)": "導出為 PDF（即將可用）", - "Export Workspace": "導出 Workspace", - "Import Workspace": "導入 Workspace", - "Language": "語言", - "Last edited by": "最後編輯者為 {{name}}", - "Layout": "佈局", - "Logout": "退出登錄", - "Settings": "設置", - "Share": "分享", - "Sync to Disk": "同步到磁盤", - "Turn into": "轉換為", - "WarningTips": { - "DoNotStore": "我們正在積極開發 AFFiNE，目前版本尚不穩定，請避免存儲信息或數據。", - "IsNotLocalWorkspace": "歡迎來到 AFFiNE 演示界面。您可以通過「同步到磁盤」來保存更改。", - "IsNotfsApiSupported": "歡迎進入AFFiNE演示！使用最新版本的基於 Chromium 內核的瀏覽器如Chrome/Edge，您可以通過「同步到磁盤」來保存更改" - } -} diff --git a/packages/i18n/package.json b/packages/i18n/package.json new file mode 100644 index 0000000000..168dee9549 --- /dev/null +++ b/packages/i18n/package.json @@ -0,0 +1,27 @@ +{ + "name": "@affine/i18n", + "version": "0.1.0", + "description": "", + "main": "dist/src/index.js", + "type": "module", + "types": "dist/src/index.d.ts", + "exports": { + "./src/*": "./dist/src/*.js", + ".": "./dist/src/index.js" + }, + "scripts": { + "build": "tsc --project ./tsconfig.json" + }, + "keywords": [], + "repository": { + "type": "git", + "url": "git+https://github.com/toeverything/AFFiNE.git" + }, + "dependencies": { + "i18next": "^21.9.1", + "react-i18next": "^11.18.4" + }, + "devDependencies": { + "typescript": "^4.8.4" + } +} diff --git a/packages/app/src/libs/i18n/index.ts b/packages/i18n/src/index.ts similarity index 86% rename from packages/app/src/libs/i18n/index.ts rename to packages/i18n/src/index.ts index fe6d76ab41..a3fd46a1d2 100644 --- a/packages/app/src/libs/i18n/index.ts +++ b/packages/i18n/src/index.ts @@ -1,10 +1,6 @@ import i18next, { Resource } from 'i18next'; -import { - I18nextProvider, - initReactI18next, - useTranslation, -} from 'react-i18next'; -import { LOCALES } from './resources'; +import { initReactI18next, useTranslation } from 'react-i18next'; +import { LOCALES } from './resources/index.js'; import type en_US from './resources/en.json'; // const localStorage = { @@ -27,7 +23,7 @@ declare module 'react-i18next' { // const STORAGE_KEY = 'i18n_lng'; -export { i18n, useTranslation, I18nProvider, LOCALES }; +export { i18n, useTranslation, LOCALES }; const resources = LOCALES.reduce( (acc, { tag, res }) => ({ ...acc, [tag]: { translation: res } }), @@ -63,4 +59,4 @@ i18n.on('languageChanged', () => { // localStorage.setItem(STORAGE_KEY, lng); }); -const I18nProvider = I18nextProvider; +// const I18nProvider = I18nextProvider; diff --git a/packages/i18n/src/resources/bn.json b/packages/i18n/src/resources/bn.json new file mode 100644 index 0000000000..0967ef424b --- /dev/null +++ b/packages/i18n/src/resources/bn.json @@ -0,0 +1 @@ +{} diff --git a/packages/app/src/libs/i18n/resources/en.json b/packages/i18n/src/resources/en.json similarity index 72% rename from packages/app/src/libs/i18n/resources/en.json rename to packages/i18n/src/resources/en.json index af7d5c03d4..a4be5ecf05 100644 --- a/packages/app/src/libs/i18n/resources/en.json +++ b/packages/i18n/src/resources/en.json @@ -34,7 +34,7 @@ "Delete page?": "Delete page?", "Delete permanently?": "Delete permanently?", "will be moved to Trash": "{{title}} will be moved to Trash", - "Once deleted, you can't undo this action.": "Once deleted,you can't undo this action.", + "Once deleted, you can't undo this action.": "Once deleted, you can't undo this action.", "Moved to Trash": "Moved to Trash", "Permanently deleted": "Permanently deleted", "restored": "{{title}} restored", @@ -54,12 +54,26 @@ "Strikethrough": "Strikethrough", "Inline code": "Inline code", "Code block": "Code block", - "Hyperlink(with selected text)": "Hyperlink(with selected text)", + "Link": "Link", "Body text": "Body text", "Heading": "Heading {{number}}", "Increase indent": "Increase indent", "Reduce indent": "Reduce indent", "Markdown Syntax": "Markdown Syntax", "Divider": "Divider", - "404 - Page Not Found": "404 - Page Not Found" + "404 - Page Not Found": "404 - Page Not Found", + "New Workspace": "New Workspace", + "Workspace description": "Workspace is your virtual space to capture, create and plan as just one person or together as a team.", + "Create": "Create", + "Select": "Select", + "Text": "Text (coming soon)", + "Shape": "Shape", + "Sticky": "Sticky (coming soon)", + "Pen": "Pen (coming soon)", + "Connector": "Connector (coming soon)", + "Upload": "Upload", + "Restore it": "Restore it", + "TrashButtonGroupTitle": "Permanently delete", + "TrashButtonGroupDescription": "Once deleted, you can't undo this action. Do you confirm?", + "Delete permanently": "Delete permanently" } diff --git a/packages/i18n/src/resources/fr.json b/packages/i18n/src/resources/fr.json new file mode 100644 index 0000000000..0967ef424b --- /dev/null +++ b/packages/i18n/src/resources/fr.json @@ -0,0 +1 @@ +{} diff --git a/packages/app/src/libs/i18n/resources/index.ts b/packages/i18n/src/resources/index.ts similarity index 100% rename from packages/app/src/libs/i18n/resources/index.ts rename to packages/i18n/src/resources/index.ts diff --git a/packages/i18n/src/resources/sr.json b/packages/i18n/src/resources/sr.json new file mode 100644 index 0000000000..0967ef424b --- /dev/null +++ b/packages/i18n/src/resources/sr.json @@ -0,0 +1 @@ +{} diff --git a/packages/i18n/src/resources/zh-Hans.json b/packages/i18n/src/resources/zh-Hans.json new file mode 100644 index 0000000000..47095233d9 --- /dev/null +++ b/packages/i18n/src/resources/zh-Hans.json @@ -0,0 +1,65 @@ +{ + "Quick search": "快速搜索", + "All pages": "全部页面", + "Favourites": "收藏夹", + "No item": "没有项目", + "Import": "导入", + "Trash": "回收站", + "New Page": "新建文章", + "New Keyword Page": "新建 '{{query}}' 为标题的文章", + "Find 0 result": "找到 0 个结果", + "Find results": "找到 {{number}} 个结果", + "Collapse sidebar": "关闭侧边栏", + "Expand sidebar": "展开侧边栏", + "Removed from Favourites": "已从收藏中移除", + "Remove from favourites": "从收藏中移除", + "Added to Favourites": "已添加到收藏", + "Add to favourites": "添加到收藏", + "Paper": "文章", + "Edgeless": "无边模式", + "Switch to": "跳转到", + "Convert to ": "转换成 ", + "Page": "文章", + "Export": "导出", + "Export to HTML": "导出到 HTML", + "Export to Markdown": "导出到 Markdown", + "Delete": "删除", + "Title": "标题", + "Untitled": "无标题", + "Created": "创建时间", + "Updated": "更新时间", + "Open in new tab": "在新页面打开", + "Favourite": "收藏", + "Favourited": "已收藏", + "Delete page?": "删除文章?", + "Delete permanently?": "永久删除?", + "will be moved to Trash": "{{title}} 将被移动到回收站", + "Once deleted, you can't undo this action.": "一次性删除，无法恢复。", + "Moved to Trash": "已移动到回收站", + "Permanently deleted": "已永久删除", + "restored": "{{title}} 已恢复", + "Cancel": "取消", + "Keyboard Shortcuts": "快捷键", + "Contact Us": "联系我们", + "Official Website": "官网", + "Get in touch!": "Get in touch!", + "AFFiNE Community": "AFFiNE Community", + "How is AFFiNE Alpha different?": "How is AFFiNE Alpha different?", + "Shortcuts": "Shortcuts", + "Undo": "Undo", + "Redo": "Redo", + "Bold": "Bold", + "Italic": "Italic", + "Underline": "Underline", + "Strikethrough": "Strikethrough", + "Inline code": "Inline code", + "Code block": "Code block", + "Link": "Link", + "Body text": "Body text", + "Heading": "Heading {{number}}", + "Increase indent": "Increase indent", + "Reduce indent": "Reduce indent", + "Markdown Syntax": "Markdown Syntax", + "Divider": "Divider", + "404 - Page Not Found": "404 - Page Not Found" +} diff --git a/packages/i18n/src/resources/zh-Hant.json b/packages/i18n/src/resources/zh-Hant.json new file mode 100644 index 0000000000..0967ef424b --- /dev/null +++ b/packages/i18n/src/resources/zh-Hant.json @@ -0,0 +1 @@ +{} diff --git a/scripts/i18n/api.ts b/packages/i18n/src/script/api.ts similarity index 100% rename from scripts/i18n/api.ts rename to packages/i18n/src/script/api.ts diff --git a/scripts/i18n/download.ts b/packages/i18n/src/script/download.ts similarity index 100% rename from scripts/i18n/download.ts rename to packages/i18n/src/script/download.ts diff --git a/scripts/i18n/request.ts b/packages/i18n/src/script/request.ts similarity index 100% rename from scripts/i18n/request.ts rename to packages/i18n/src/script/request.ts diff --git a/scripts/i18n/sync.ts b/packages/i18n/src/script/sync.ts similarity index 100% rename from scripts/i18n/sync.ts rename to packages/i18n/src/script/sync.ts diff --git a/scripts/i18n/utils.ts b/packages/i18n/src/script/utils.ts similarity index 100% rename from scripts/i18n/utils.ts rename to packages/i18n/src/script/utils.ts diff --git a/packages/i18n/tsconfig.json b/packages/i18n/tsconfig.json new file mode 100644 index 0000000000..e13f7340ab --- /dev/null +++ b/packages/i18n/tsconfig.json @@ -0,0 +1,25 @@ +{ + "compilerOptions": { + "target": "ESNext", + "lib": ["dom", "dom.iterable", "esnext"], + "allowJs": true, + "skipLibCheck": true, + "strict": true, + "forceConsistentCasingInFileNames": true, + "noEmit": false, + "esModuleInterop": true, + "module": "ESNext", + "moduleResolution": "node", + "resolveJsonModule": true, + "isolatedModules": true, + "jsx": "react-jsx", + "incremental": true, + "experimentalDecorators": true, + "declaration": true, + "baseUrl": ".", + "rootDir": ".", + "outDir": "./dist" + }, + "include": ["src/**/*.ts"], + "exclude": ["node_modules", "dist"] +} diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f12779edb4..4332ae861c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -39,6 +39,7 @@ importers: packages/app: specifiers: '@affine/datacenter': workspace:* + '@affine/i18n': workspace:* '@blocksuite/blocks': 0.3.1-20230109032243-37ad3ba '@blocksuite/editor': 0.3.1-20230109032243-37ad3ba '@blocksuite/icons': ^2.0.2 @@ -65,7 +66,6 @@ importers: eslint-config-next: 12.3.1 eslint-config-prettier: ^8.5.0 eslint-plugin-prettier: ^4.2.1 - i18next: ^21.9.1 lit: ^2.3.1 next: 13.1.0 next-debug-local: ^0.1.5 @@ -76,11 +76,11 @@ importers: raw-loader: ^4.0.2 react: 18.2.0 react-dom: 18.2.0 - react-i18next: ^11.18.4 typescript: 4.8.3 yjs: ^13.5.44 dependencies: '@affine/datacenter': link:../data-center + '@affine/i18n': link:../i18n '@blocksuite/blocks': 0.3.1-20230109032243-37ad3ba_yjs@13.5.44 '@blocksuite/editor': 0.3.1-20230109032243-37ad3ba_yjs@13.5.44 '@blocksuite/icons': 2.0.4_w5j4k42lgipnm43s3brx6h3c34 @@ -98,7 +98,6 @@ importers: cmdk: 0.1.21_7ey2zzynotv32rpkwno45fsx4e css-spring: 4.1.0 dayjs: 1.11.7 - i18next: 21.10.0 lit: 2.4.0 next: 13.1.0_biqbaboplfbrettd7655fr4n2y next-debug-local: 0.1.5 @@ -107,7 +106,6 @@ importers: quill-cursors: 4.0.0 react: 18.2.0 react-dom: 18.2.0_react@18.2.0 - react-i18next: 11.18.6_vfm63zmruocgezzfl2v26zlzpy yjs: 13.5.44 devDependencies: '@types/node': 18.7.18 @@ -160,6 +158,17 @@ importers: fake-indexeddb: 4.0.1 typescript: 4.9.3 + packages/i18n: + specifiers: + i18next: ^21.9.1 + react-i18next: ^11.18.4 + typescript: ^4.8.4 + dependencies: + i18next: 21.10.0 + react-i18next: 11.18.6_i18next@21.10.0 + devDependencies: + typescript: 4.9.3 + packages/logger: specifiers: '@types/react': ^18.0.21 @@ -1361,6 +1370,7 @@ packages: engines: {node: '>=6.9.0'} dependencies: regenerator-runtime: 0.13.9 + dev: false /@babel/runtime/7.20.7: resolution: {integrity: sha512-UF0tvkUtxwAgZ5W/KrkHf0Rn0fdnLDU9ScxBrEVNUprE/MzirjK4MJUX1/BVDv00Sv8cljtukVK1aky++X1SjQ==} @@ -1704,7 +1714,7 @@ packages: dependencies: '@babel/helper-module-imports': 7.18.6 '@babel/plugin-syntax-jsx': 7.18.6 - '@babel/runtime': 7.19.0 + '@babel/runtime': 7.20.7 '@emotion/hash': 0.9.0 '@emotion/memoize': 0.8.0 '@emotion/serialize': 1.1.0 @@ -2586,7 +2596,7 @@ packages: '@types/react': optional: true dependencies: - '@babel/runtime': 7.19.0 + '@babel/runtime': 7.20.7 '@mui/utils': 5.10.9_react@18.2.0 '@types/react': 18.0.20 prop-types: 15.8.1 @@ -2606,7 +2616,7 @@ packages: '@emotion/styled': optional: true dependencies: - '@babel/runtime': 7.19.0 + '@babel/runtime': 7.20.7 '@emotion/cache': 11.10.3 '@emotion/react': 11.10.4_w5j4k42lgipnm43s3brx6h3c34 '@emotion/styled': 11.10.4_yiaqs725o7pcd7rteavrnhgj4y @@ -2631,7 +2641,7 @@ packages: '@types/react': optional: true dependencies: - '@babel/runtime': 7.19.0 + '@babel/runtime': 7.20.7 '@emotion/react': 11.10.4_w5j4k42lgipnm43s3brx6h3c34 '@emotion/styled': 11.10.4_yiaqs725o7pcd7rteavrnhgj4y '@mui/private-theming': 5.10.9_w5j4k42lgipnm43s3brx6h3c34 @@ -2662,7 +2672,7 @@ packages: peerDependencies: react: ^17.0.0 || ^18.0.0 dependencies: - '@babel/runtime': 7.19.0 + '@babel/runtime': 7.20.7 '@types/prop-types': 15.7.5 '@types/react-is': 17.0.3 prop-types: 15.8.1 @@ -3704,7 +3714,7 @@ packages: resolution: {integrity: sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA==} engines: {node: '>=6.0'} dependencies: - '@babel/runtime': 7.19.0 + '@babel/runtime': 7.20.7 '@babel/runtime-corejs3': 7.19.1 dev: true @@ -3809,7 +3819,7 @@ packages: resolution: {integrity: sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==} engines: {node: '>=10', npm: '>=6'} dependencies: - '@babel/runtime': 7.19.0 + '@babel/runtime': 7.20.7 cosmiconfig: 7.0.1 resolve: 1.22.1 dev: false @@ -4374,7 +4384,7 @@ packages: /dom-helpers/5.2.1: resolution: {integrity: sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==} dependencies: - '@babel/runtime': 7.19.0 + '@babel/runtime': 7.20.7 csstype: 3.1.1 dev: false @@ -4741,7 +4751,7 @@ packages: peerDependencies: eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8 dependencies: - '@babel/runtime': 7.19.0 + '@babel/runtime': 7.20.7 aria-query: 4.2.2 array-includes: 3.1.5 ast-types-flow: 0.0.7 @@ -4763,7 +4773,7 @@ packages: peerDependencies: eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8 dependencies: - '@babel/runtime': 7.19.0 + '@babel/runtime': 7.20.7 aria-query: 4.2.2 array-includes: 3.1.5 ast-types-flow: 0.0.7 @@ -5595,7 +5605,7 @@ packages: /i18next/21.10.0: resolution: {integrity: sha512-YeuIBmFsGjUfO3qBmMOc0rQaun4mIpGKET5WDwvu8lU7gvwpcariZLNtL0Fzj+zazcHUrlXHiptcFhBMFaxzfg==} dependencies: - '@babel/runtime': 7.19.0 + '@babel/runtime': 7.20.7 dev: false /iconv-lite/0.4.24: @@ -7011,7 +7021,7 @@ packages: react: 18.2.0 scheduler: 0.23.0 - /react-i18next/11.18.6_vfm63zmruocgezzfl2v26zlzpy: + /react-i18next/11.18.6_i18next@21.10.0: resolution: {integrity: sha512-yHb2F9BiT0lqoQDt8loZ5gWP331GwctHz9tYQ8A2EIEUu+CcEdjBLQWli1USG3RdWQt3W+jqQLg/d4rrQR96LA==} peerDependencies: i18next: '>= 19.0.0' @@ -7024,11 +7034,9 @@ packages: react-native: optional: true dependencies: - '@babel/runtime': 7.19.0 + '@babel/runtime': 7.20.7 html-parse-stringify: 3.0.1 i18next: 21.10.0 - react: 18.2.0 - react-dom: 18.2.0_react@18.2.0 dev: false /react-is/16.13.1: @@ -7096,7 +7104,7 @@ packages: react: '>=16.6.0' react-dom: '>=16.6.0' dependencies: - '@babel/runtime': 7.19.0 + '@babel/runtime': 7.20.7 dom-helpers: 5.2.1 loose-envify: 1.4.0 prop-types: 15.8.1 @@ -8280,7 +8288,7 @@ packages: '@apideck/better-ajv-errors': 0.3.6_ajv@8.11.2 '@babel/core': 7.20.5 '@babel/preset-env': 7.20.2_@babel+core@7.20.5 - '@babel/runtime': 7.19.0 + '@babel/runtime': 7.20.7 '@rollup/plugin-babel': 5.3.1_opjstonlpkhafnz76jsxdwq25a '@rollup/plugin-node-resolve': 11.2.1_rollup@2.79.1 '@rollup/plugin-replace': 2.4.2_rollup@2.79.1 From 270c3f5a6ac23edcf5e98ab19a8df4876acb3df5 Mon Sep 17 00:00:00 2001 From: JimmFly Date: Mon, 9 Jan 2023 14:57:49 +0800 Subject: [PATCH 02/33] chore: update import package name --- packages/app/src/components/404/index.tsx | 2 +- packages/app/src/components/contact-modal/index.tsx | 2 +- packages/app/src/components/editor-mode-switch/index.tsx | 2 +- packages/app/src/components/header/QuickSearchButton.tsx | 2 +- .../components/header/header-right-items/EditorOptionMenu.tsx | 2 +- packages/app/src/components/help-island/index.tsx | 2 +- packages/app/src/components/import/index.tsx | 2 +- packages/app/src/components/page-list/OperationCell.tsx | 2 +- packages/app/src/components/page-list/index.tsx | 2 +- packages/app/src/components/quick-search/Footer.tsx | 2 +- packages/app/src/components/quick-search/Results.tsx | 2 +- packages/app/src/components/quick-search/config.ts | 2 +- packages/app/src/components/shortcuts-modal/config.ts | 2 +- packages/app/src/components/shortcuts-modal/index.tsx | 2 +- packages/app/src/components/workspace-slider-bar/index.tsx | 2 +- packages/app/src/pages/_app.tsx | 2 +- packages/app/src/pages/workspace/[workspaceId]/all.tsx | 2 +- packages/app/src/pages/workspace/[workspaceId]/favorite.tsx | 2 +- packages/app/src/pages/workspace/[workspaceId]/trash.tsx | 2 +- packages/app/src/ui/confirm/Confirm.tsx | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/packages/app/src/components/404/index.tsx b/packages/app/src/components/404/index.tsx index 7df644bbfe..8ed4232807 100644 --- a/packages/app/src/components/404/index.tsx +++ b/packages/app/src/components/404/index.tsx @@ -1,5 +1,5 @@ import { NotFoundTitle, PageContainer } from './styles'; -import { useTranslation } from 'react-i18next'; +import { useTranslation } from '@affine/i18n'; export const NotfoundPage = () => { const { t } = useTranslation(); return ( diff --git a/packages/app/src/components/contact-modal/index.tsx b/packages/app/src/components/contact-modal/index.tsx index 0cb97f1176..3cd4d04f85 100644 --- a/packages/app/src/components/contact-modal/index.tsx +++ b/packages/app/src/components/contact-modal/index.tsx @@ -23,7 +23,7 @@ import { StyledModalFooter, } from './style'; import bg from '@/components/contact-modal/bg.png'; -import { useTranslation } from 'react-i18next'; +import { useTranslation } from '@affine/i18n'; const linkList = [ { icon: , diff --git a/packages/app/src/components/editor-mode-switch/index.tsx b/packages/app/src/components/editor-mode-switch/index.tsx index 2e8ccfdcf2..5fe4217c3e 100644 --- a/packages/app/src/components/editor-mode-switch/index.tsx +++ b/packages/app/src/components/editor-mode-switch/index.tsx @@ -15,7 +15,7 @@ import { useTheme } from '@/providers/ThemeProvider'; import { EdgelessIcon, PaperIcon } from './Icons'; import useCurrentPageMeta from '@/hooks/use-current-page-meta'; import { usePageHelper } from '@/hooks/use-page-helper'; -import { useTranslation } from 'react-i18next'; +import { useTranslation } from '@affine/i18n'; const PaperItem = ({ active }: { active?: boolean }) => { const { theme: { diff --git a/packages/app/src/components/header/QuickSearchButton.tsx b/packages/app/src/components/header/QuickSearchButton.tsx index 0c1732adb1..0b28e43b09 100644 --- a/packages/app/src/components/header/QuickSearchButton.tsx +++ b/packages/app/src/components/header/QuickSearchButton.tsx @@ -3,7 +3,7 @@ import { IconButton, IconButtonProps } from '@/ui/button'; import { Tooltip } from '@/ui/tooltip'; import { ArrowDownIcon } from '@blocksuite/icons'; import { useModal } from '@/providers/GlobalModalProvider'; -import { useTranslation } from 'react-i18next'; +import { useTranslation } from '@affine/i18n'; export const QuickSearchButton = ({ onClick, ...props diff --git a/packages/app/src/components/header/header-right-items/EditorOptionMenu.tsx b/packages/app/src/components/header/header-right-items/EditorOptionMenu.tsx index db3e1751f4..b4eef4ebfc 100644 --- a/packages/app/src/components/header/header-right-items/EditorOptionMenu.tsx +++ b/packages/app/src/components/header/header-right-items/EditorOptionMenu.tsx @@ -16,7 +16,7 @@ import { usePageHelper } from '@/hooks/use-page-helper'; import { useConfirm } from '@/providers/ConfirmProvider'; import useCurrentPageMeta from '@/hooks/use-current-page-meta'; import { toast } from '@/ui/toast'; -import { useTranslation } from 'react-i18next'; +import { useTranslation } from '@affine/i18n'; const PopoverContent = () => { const { editor } = useAppState(); const { toggleFavoritePage, toggleDeletePage } = usePageHelper(); diff --git a/packages/app/src/components/help-island/index.tsx b/packages/app/src/components/help-island/index.tsx index b904cefb5c..d6aad0c891 100644 --- a/packages/app/src/components/help-island/index.tsx +++ b/packages/app/src/components/help-island/index.tsx @@ -8,7 +8,7 @@ import { import { CloseIcon, ContactIcon, HelpIcon, KeyboardIcon } from './Icons'; import Grow from '@mui/material/Grow'; import { Tooltip } from '@/ui/tooltip'; -import { useTranslation } from 'react-i18next'; +import { useTranslation } from '@affine/i18n'; import { useModal } from '@/providers/GlobalModalProvider'; import { useTheme } from '@/providers/ThemeProvider'; import useCurrentPageMeta from '@/hooks/use-current-page-meta'; diff --git a/packages/app/src/components/import/index.tsx b/packages/app/src/components/import/index.tsx index 96a383dad2..8f867d3bfa 100644 --- a/packages/app/src/components/import/index.tsx +++ b/packages/app/src/components/import/index.tsx @@ -6,7 +6,7 @@ import Loading from '@/components/loading'; import { usePageHelper } from '@/hooks/use-page-helper'; import { useAppState } from '@/providers/app-state-provider/context'; import { useEffect, useState } from 'react'; -import { useTranslation } from 'react-i18next'; +import { useTranslation } from '@affine/i18n'; // import { Tooltip } from '@/ui/tooltip'; type ImportModalProps = { open: boolean; diff --git a/packages/app/src/components/page-list/OperationCell.tsx b/packages/app/src/components/page-list/OperationCell.tsx index d72b99b518..ca59efa60a 100644 --- a/packages/app/src/components/page-list/OperationCell.tsx +++ b/packages/app/src/components/page-list/OperationCell.tsx @@ -14,7 +14,7 @@ import { } from '@blocksuite/icons'; import { toast } from '@/ui/toast'; import { usePageHelper } from '@/hooks/use-page-helper'; -import { useTranslation } from 'react-i18next'; +import { useTranslation } from '@affine/i18n'; export const OperationCell = ({ pageMeta }: { pageMeta: PageMeta }) => { const { id, favorite } = pageMeta; const { openPage } = usePageHelper(); diff --git a/packages/app/src/components/page-list/index.tsx b/packages/app/src/components/page-list/index.tsx index 2d5f13ed58..dca0e15cac 100644 --- a/packages/app/src/components/page-list/index.tsx +++ b/packages/app/src/components/page-list/index.tsx @@ -24,7 +24,7 @@ import { useAppState } from '@/providers/app-state-provider/context'; import { toast } from '@/ui/toast'; import { usePageHelper } from '@/hooks/use-page-helper'; import { useTheme } from '@/providers/ThemeProvider'; -import { useTranslation } from 'react-i18next'; +import { useTranslation } from '@affine/i18n'; const FavoriteTag = ({ pageMeta: { favorite, id }, }: { diff --git a/packages/app/src/components/quick-search/Footer.tsx b/packages/app/src/components/quick-search/Footer.tsx index 59680216f8..14b37561b6 100644 --- a/packages/app/src/components/quick-search/Footer.tsx +++ b/packages/app/src/components/quick-search/Footer.tsx @@ -4,7 +4,7 @@ import { StyledModalFooterContent } from './style'; import { useModal } from '@/providers/GlobalModalProvider'; import { Command } from 'cmdk'; import { usePageHelper } from '@/hooks/use-page-helper'; -import { useTranslation } from 'react-i18next'; +import { useTranslation } from '@affine/i18n'; export const Footer = (props: { query: string }) => { const { triggerQuickSearchModal } = useModal(); const { openPage, createPage } = usePageHelper(); diff --git a/packages/app/src/components/quick-search/Results.tsx b/packages/app/src/components/quick-search/Results.tsx index fc22e97136..a11206f339 100644 --- a/packages/app/src/components/quick-search/Results.tsx +++ b/packages/app/src/components/quick-search/Results.tsx @@ -7,7 +7,7 @@ import { useAppState } from '@/providers/app-state-provider'; import { useRouter } from 'next/router'; import { useSwitchToConfig } from './config'; import { NoResultSVG } from './NoResultSVG'; -import { useTranslation } from 'react-i18next'; +import { useTranslation } from '@affine/i18n'; import usePageHelper from '@/hooks/use-page-helper'; import usePageMetaList from '@/hooks/use-page-meta-list'; export const Results = (props: { diff --git a/packages/app/src/components/quick-search/config.ts b/packages/app/src/components/quick-search/config.ts index c35636c3cc..ce99ad5627 100644 --- a/packages/app/src/components/quick-search/config.ts +++ b/packages/app/src/components/quick-search/config.ts @@ -1,5 +1,5 @@ import { AllPagesIcon, FavouritesIcon, TrashIcon } from '@blocksuite/icons'; -import { useTranslation } from 'react-i18next'; +import { useTranslation } from '@affine/i18n'; export const useSwitchToConfig = ( currentWorkspaceId: string diff --git a/packages/app/src/components/shortcuts-modal/config.ts b/packages/app/src/components/shortcuts-modal/config.ts index 95dd4c5b63..90471c1f86 100644 --- a/packages/app/src/components/shortcuts-modal/config.ts +++ b/packages/app/src/components/shortcuts-modal/config.ts @@ -1,4 +1,4 @@ -import { useTranslation } from 'react-i18next'; +import { useTranslation } from '@affine/i18n'; interface ShortcutTip { [x: string]: string; } diff --git a/packages/app/src/components/shortcuts-modal/index.tsx b/packages/app/src/components/shortcuts-modal/index.tsx index 980f281d78..280adeb7e6 100644 --- a/packages/app/src/components/shortcuts-modal/index.tsx +++ b/packages/app/src/components/shortcuts-modal/index.tsx @@ -16,7 +16,7 @@ import { import Slide from '@mui/material/Slide'; import { ModalCloseButton } from '@/ui/modal'; import { getUaHelper } from '@/utils'; -import { useTranslation } from 'react-i18next'; +import { useTranslation } from '@affine/i18n'; type ModalProps = { open: boolean; onClose: () => void; diff --git a/packages/app/src/components/workspace-slider-bar/index.tsx b/packages/app/src/components/workspace-slider-bar/index.tsx index 533ea42927..de12f6474d 100644 --- a/packages/app/src/components/workspace-slider-bar/index.tsx +++ b/packages/app/src/components/workspace-slider-bar/index.tsx @@ -30,7 +30,7 @@ import { IconButton } from '@/ui/button'; import useLocalStorage from '@/hooks/use-local-storage'; import usePageMetaList from '@/hooks/use-page-meta-list'; import { usePageHelper } from '@/hooks/use-page-helper'; -import { useTranslation } from 'react-i18next'; +import { useTranslation } from '@affine/i18n'; const FavoriteList = ({ showList }: { showList: boolean }) => { const { openPage } = usePageHelper(); diff --git a/packages/app/src/pages/_app.tsx b/packages/app/src/pages/_app.tsx index 179cae802d..cbd7a0299c 100644 --- a/packages/app/src/pages/_app.tsx +++ b/packages/app/src/pages/_app.tsx @@ -18,7 +18,7 @@ import { useEffect } from 'react'; import { useAppState } from '@/providers/app-state-provider'; import { PageLoading } from '@/components/loading'; import Head from 'next/head'; -import '@/libs/i18n'; +import '@affine/i18n'; const ThemeProvider = dynamic(() => import('@/providers/ThemeProvider'), { ssr: false, diff --git a/packages/app/src/pages/workspace/[workspaceId]/all.tsx b/packages/app/src/pages/workspace/[workspaceId]/all.tsx index 18f6e2a64b..155a4303e5 100644 --- a/packages/app/src/pages/workspace/[workspaceId]/all.tsx +++ b/packages/app/src/pages/workspace/[workspaceId]/all.tsx @@ -4,7 +4,7 @@ import usePageMetaList from '@/hooks/use-page-meta-list'; import { PageListHeader } from '@/components/header'; import { ReactElement } from 'react'; import WorkspaceLayout from '@/components/workspace-layout'; -import { useTranslation } from 'react-i18next'; +import { useTranslation } from '@affine/i18n'; const All = () => { const pageMetaList = usePageMetaList(); const { t } = useTranslation(); diff --git a/packages/app/src/pages/workspace/[workspaceId]/favorite.tsx b/packages/app/src/pages/workspace/[workspaceId]/favorite.tsx index d787f34e1b..bc64db309a 100644 --- a/packages/app/src/pages/workspace/[workspaceId]/favorite.tsx +++ b/packages/app/src/pages/workspace/[workspaceId]/favorite.tsx @@ -4,7 +4,7 @@ import { FavouritesIcon } from '@blocksuite/icons'; import usePageMetaList from '@/hooks/use-page-meta-list'; import { ReactElement } from 'react'; import WorkspaceLayout from '@/components/workspace-layout'; -import { useTranslation } from 'react-i18next'; +import { useTranslation } from '@affine/i18n'; export const Favorite = () => { const pageMetaList = usePageMetaList(); const { t } = useTranslation(); diff --git a/packages/app/src/pages/workspace/[workspaceId]/trash.tsx b/packages/app/src/pages/workspace/[workspaceId]/trash.tsx index 2343b39138..07fa7ea1f4 100644 --- a/packages/app/src/pages/workspace/[workspaceId]/trash.tsx +++ b/packages/app/src/pages/workspace/[workspaceId]/trash.tsx @@ -4,7 +4,7 @@ import { TrashIcon } from '@blocksuite/icons'; import usePageMetaList from '@/hooks/use-page-meta-list'; import { ReactElement } from 'react'; import WorkspaceLayout from '@/components/workspace-layout'; -import { useTranslation } from 'react-i18next'; +import { useTranslation } from '@affine/i18n'; export const Trash = () => { const pageMetaList = usePageMetaList(); const { t } = useTranslation(); diff --git a/packages/app/src/ui/confirm/Confirm.tsx b/packages/app/src/ui/confirm/Confirm.tsx index bbffe75f65..c2bc2a338c 100644 --- a/packages/app/src/ui/confirm/Confirm.tsx +++ b/packages/app/src/ui/confirm/Confirm.tsx @@ -7,7 +7,7 @@ import { StyledModalWrapper, } from '@/ui/confirm/styles'; import { Button } from '@/ui/button'; -import { useTranslation } from 'react-i18next'; +import { useTranslation } from '@affine/i18n'; export type ConfirmProps = { title?: string; content?: string; From 13cb76321d3174e68694b264a6d704535e881247 Mon Sep 17 00:00:00 2001 From: JimmFly Date: Mon, 9 Jan 2023 15:06:47 +0800 Subject: [PATCH 03/33] fix: add prettier --- packages/i18n/package.json | 1 + pnpm-lock.yaml | 3 +++ 2 files changed, 4 insertions(+) diff --git a/packages/i18n/package.json b/packages/i18n/package.json index 168dee9549..7e1d0b49d1 100644 --- a/packages/i18n/package.json +++ b/packages/i18n/package.json @@ -19,6 +19,7 @@ }, "dependencies": { "i18next": "^21.9.1", + "prettier": "^2.7.1", "react-i18next": "^11.18.4" }, "devDependencies": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4332ae861c..0f7c11f041 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -161,10 +161,12 @@ importers: packages/i18n: specifiers: i18next: ^21.9.1 + prettier: ^2.7.1 react-i18next: ^11.18.4 typescript: ^4.8.4 dependencies: i18next: 21.10.0 + prettier: 2.7.1 react-i18next: 11.18.6_i18next@21.10.0 devDependencies: typescript: 4.9.3 @@ -6895,6 +6897,7 @@ packages: /prettier/2.7.1: resolution: {integrity: sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==} engines: {node: '>=10.13.0'} + hasBin: true /pretty-bytes/5.6.0: resolution: {integrity: sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==} From 36a96b23e6497d5e381705da07a3b0bc6408775a Mon Sep 17 00:00:00 2001 From: JimmFly Date: Mon, 9 Jan 2023 15:19:20 +0800 Subject: [PATCH 04/33] chore: update i18n keys --- packages/app/src/components/shortcuts-modal/config.ts | 4 ++-- packages/i18n/src/resources/en.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/app/src/components/shortcuts-modal/config.ts b/packages/app/src/components/shortcuts-modal/config.ts index 90471c1f86..02759297eb 100644 --- a/packages/app/src/components/shortcuts-modal/config.ts +++ b/packages/app/src/components/shortcuts-modal/config.ts @@ -13,7 +13,7 @@ export const useMacKeyboardShortcuts = (): ShortcutTip => { [t('Strikethrough')]: '⌘+⇧+S', [t('Inline code')]: ' ⌘+E', [t('Code block')]: '⌘+⌥+C', - [t('Hyperlink(with selected text)')]: '⌘+K', + [t('Link')]: '⌘+K', [t('Quick search')]: '⌘+K', [t('Body text')]: '⌘+⌥+0', [t('Heading', { number: '1' })]: '⌘+⌥+1', @@ -57,7 +57,7 @@ export const useWindowsKeyboardShortcuts = (): ShortcutTip => { [t('Strikethrough')]: 'Ctrl+Shift+S', [t('Inline code')]: ' Ctrl+E', [t('Code block')]: 'Ctrl+Alt+C', - [t('Hyperlink(with selected text)')]: 'Ctrl+K', + [t('Link')]: 'Ctrl+K', [t('Quick search')]: 'Ctrl+K', [t('Body text')]: 'Ctrl+Shift+0', [t('Heading', { number: '1' })]: 'Ctrl+Shift+1', diff --git a/packages/i18n/src/resources/en.json b/packages/i18n/src/resources/en.json index a4be5ecf05..78dcb2fb28 100644 --- a/packages/i18n/src/resources/en.json +++ b/packages/i18n/src/resources/en.json @@ -54,7 +54,7 @@ "Strikethrough": "Strikethrough", "Inline code": "Inline code", "Code block": "Code block", - "Link": "Link", + "Link": "Hyperlink(with selected text)", "Body text": "Body text", "Heading": "Heading {{number}}", "Increase indent": "Increase indent", From ce9dc37217c9973c73cf254cdc2d7eba74d7c801 Mon Sep 17 00:00:00 2001 From: JimmFly Date: Mon, 9 Jan 2023 15:37:50 +0800 Subject: [PATCH 05/33] fix: add return type --- packages/i18n/src/script/api.ts | 38 +++++++++++++++++++++++++-------- 1 file changed, 29 insertions(+), 9 deletions(-) diff --git a/packages/i18n/src/script/api.ts b/packages/i18n/src/script/api.ts index 0cd1a156b4..ae286fe584 100644 --- a/packages/i18n/src/script/api.ts +++ b/packages/i18n/src/script/api.ts @@ -43,7 +43,19 @@ import { fetchTolgee } from './request'; * ] * ``` */ -export const getAllProjectLanguages = async (size = 1000) => { + +export const getAllProjectLanguages = async ( + size = 1000 +): Promise< + { + id: number; + name: string; + tag: string; + originalName: string; + flagEmoji: string; + base: boolean; + }[] +> => { const url = `/languages?size=${size}`; const resp = await fetchTolgee(url); if (resp.status < 200 || resp.status >= 300) { @@ -70,7 +82,7 @@ export const getAllProjectLanguages = async (size = 1000) => { * * See https://tolgee.io/api#operation/getTranslations_ */ -export const getTranslations = async () => { +export const getTranslations = async (): Promise => { const url = '/translations'; const resp = await fetchTolgee(url); if (resp.status < 200 || resp.status >= 300) { @@ -87,17 +99,19 @@ export const getTranslations = async () => { */ export const getLanguagesTranslations = async ( languages: T -) => { +): Promise<{ [key in T]?: Record }> => { const url = `/translations/${languages}`; const resp = await fetchTolgee(url); if (resp.status < 200 || resp.status >= 300) { throw new Error(url + ' ' + resp.status + '\n' + (await resp.text())); } - const json: { [key in T]?: Record } = await resp.json(); + const json = await resp.json(); return json; }; -export const getRemoteTranslations = async (languages: string) => { +export const getRemoteTranslations = async ( + languages: string +): Promise> => { const translations = await getLanguagesTranslations(languages); if (!(languages in translations)) { return {}; @@ -115,7 +129,7 @@ export const getRemoteTranslations = async (languages: string) => { export const createsNewKey = async ( key: string, translations: Record -) => { +): Promise => { const url = '/translations/keys/create'; const resp = await fetchTolgee(url, { method: 'POST', @@ -133,7 +147,10 @@ export const createsNewKey = async ( * * See https://tolgee.io/api#operation/tagKey_1 */ -export const addTag = async (keyId: string, tagName: string) => { +export const addTag = async ( + keyId: string, + tagName: string +): Promise => { const url = `/keys/${keyId}/tags`; const resp = await fetchTolgee(url, { method: 'PUT', @@ -151,7 +168,10 @@ export const addTag = async (keyId: string, tagName: string) => { * * See https://tolgee.io/api#operation/tagKey_1 */ -export const removeTag = async (keyId: string, tagId: number) => { +export const removeTag = async ( + keyId: string, + tagId: number +): Promise => { const url = `/keys/${keyId}/tags/${tagId}`; const resp = await fetchTolgee(url, { method: 'DELETE', @@ -174,7 +194,7 @@ export const removeTag = async (keyId: string, tagId: number) => { * * See https://tolgee.io/api#operation/export_1 */ -export const exportResources = async () => { +export const exportResources = async (): Promise => { const url = `/export`; const resp = await fetchTolgee(url); From efb23968e8d460edbcfbba6836a1c44e14e6859c Mon Sep 17 00:00:00 2001 From: JimmFly Date: Mon, 9 Jan 2023 15:45:05 +0800 Subject: [PATCH 06/33] feat: add types/prettier to i18n package --- packages/i18n/package.json | 1 + pnpm-lock.yaml | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/packages/i18n/package.json b/packages/i18n/package.json index 7e1d0b49d1..cc559528e3 100644 --- a/packages/i18n/package.json +++ b/packages/i18n/package.json @@ -23,6 +23,7 @@ "react-i18next": "^11.18.4" }, "devDependencies": { + "@types/prettier": "^2.7.2", "typescript": "^4.8.4" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0f7c11f041..76ec8caa50 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -160,6 +160,7 @@ importers: packages/i18n: specifiers: + '@types/prettier': ^2.7.2 i18next: ^21.9.1 prettier: ^2.7.1 react-i18next: ^11.18.4 @@ -169,6 +170,7 @@ importers: prettier: 2.7.1 react-i18next: 11.18.6_i18next@21.10.0 devDependencies: + '@types/prettier': 2.7.2 typescript: 4.9.3 packages/logger: @@ -3359,6 +3361,10 @@ packages: resolution: {integrity: sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==} dev: false + /@types/prettier/2.7.2: + resolution: {integrity: sha512-KufADq8uQqo1pYKVIYzfKbJfBAc0sOeXqGbFaSpv8MRmC/zXgowNZmFcbngndGk922QDmOASEXUZCaY48gs4cg==} + dev: true + /@types/prop-types/15.7.5: resolution: {integrity: sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==} From 3e9304fb050e4c4930c16a47c5a79317c769a015 Mon Sep 17 00:00:00 2001 From: MingLiang Wang Date: Mon, 9 Jan 2023 16:45:26 +0800 Subject: [PATCH 07/33] feat: cache workspace instances --- packages/data-center/src/datacenter.ts | 53 +++++++++++-------- .../data-center/src/provider/affine/affine.ts | 16 +++--- packages/data-center/src/provider/base.ts | 9 ++++ .../data-center/src/provider/local/local.ts | 8 +-- 4 files changed, 54 insertions(+), 32 deletions(-) diff --git a/packages/data-center/src/datacenter.ts b/packages/data-center/src/datacenter.ts index 00ca590ae3..907b0e310a 100644 --- a/packages/data-center/src/datacenter.ts +++ b/packages/data-center/src/datacenter.ts @@ -1,6 +1,6 @@ import { Workspaces } from './workspaces'; import type { WorkspacesChangeEvent } from './workspaces'; -import { BlobStorage, Workspace } from '@blocksuite/store'; +import { Workspace } from '@blocksuite/store'; import { BaseProvider } from './provider/base'; import { LocalProvider } from './provider/local/local'; import { AffineProvider } from './provider'; @@ -17,6 +17,7 @@ import { applyUpdate, encodeStateAsUpdate } from 'yjs'; export class DataCenter { private readonly _workspaces = new Workspaces(); private readonly _logger = getLogger('dc'); + private _workspaceInstances: Map = new Map(); /** * A mainProvider must exist as the only data trustworthy source. */ @@ -109,9 +110,14 @@ export class DataCenter { * @param {string} workspaceId workspace id */ private _getWorkspace(workspaceId: string) { - return new Workspace({ - room: workspaceId, - }).register(BlockSchema); + const workspaceInfo = this._workspaces.find(workspaceId); + assert(workspaceInfo, 'Workspace not found'); + return ( + this._workspaceInstances.get(workspaceId) || + new Workspace({ + room: workspaceId, + }).register(BlockSchema) + ); } /** @@ -149,8 +155,9 @@ export class DataCenter { const provider = this.providerMap.get(workspaceInfo.provider); assert(provider, `provide '${workspaceInfo.provider}' is not registered`); this._logger(`Loading ${workspaceInfo.provider} workspace: `, workspaceId); - - return await provider.warpWorkspace(this._getWorkspace(workspaceId)); + const workspace = this._getWorkspace(workspaceId); + this._workspaceInstances.set(workspaceId, workspace); + return await provider.warpWorkspace(workspace); } /** @@ -332,21 +339,23 @@ export class DataCenter { return; } - // /** - // * get blob url by workspaces id - // * @param id - // * @returns {Promise} blob url - // */ - // async getBlob(id: string): Promise { - // return await this._blobStorage.get(id); - // } + /** + * get blob url by workspaces id + * @param id + * @returns {Promise} blob url + */ + async getBlob(workspace: Workspace, id: string): Promise { + const blob = await workspace.blobs; + return (await blob?.get(id)) || ''; + } - // /** - // * up load blob and get a blob url - // * @param id - // * @returns {Promise} blob url - // */ - // async setBlob(blob: Blob): Promise { - // return await this._blobStorage.set(blob); - // } + /** + * up load blob and get a blob url + * @param id + * @returns {Promise} blob url + */ + async setBlob(workspace: Workspace, blob: Blob): Promise { + const blobStorage = await workspace.blobs; + return (await blobStorage?.set(blob)) || ''; + } } diff --git a/packages/data-center/src/provider/affine/affine.ts b/packages/data-center/src/provider/affine/affine.ts index cb9b1704d3..28cb19f1f6 100644 --- a/packages/data-center/src/provider/affine/affine.ts +++ b/packages/data-center/src/provider/affine/affine.ts @@ -69,7 +69,7 @@ export class AffineProvider extends BaseProvider { override async warpWorkspace(workspace: Workspace) { const { doc, room } = workspace; assert(room); - this._initWorkspaceDb(workspace); + this.linkLocal(workspace); const updates = await downloadWorkspace(room); if (updates) { await new Promise(resolve => { @@ -77,8 +77,12 @@ export class AffineProvider extends BaseProvider { applyUpdate(doc, new Uint8Array(updates)); }); } - const ws = new WebsocketProvider('/', room, doc); - this._wsMap.set(room, ws); + let ws = this._wsMap.get(room); + if (!ws) { + ws = new WebsocketProvider('/', room, doc); + this._wsMap.set(room, ws); + } + ws.connect(); await new Promise((resolve, reject) => { // TODO: synced will also be triggered on reconnection after losing sync // There needs to be an event mechanism to emit the synchronization state to the upper layer @@ -231,7 +235,7 @@ export class AffineProvider extends BaseProvider { return await removeMember({ permissionId }); } - private async _initWorkspaceDb(workspace: Workspace) { + public override async linkLocal(workspace: Workspace) { assert(workspace.room); let idb = this._idbMap.get(workspace.room); idb?.destroy(); @@ -239,7 +243,7 @@ export class AffineProvider extends BaseProvider { this._idbMap.set(workspace.room, idb); await idb.whenSynced; this._logger('Local data loaded'); - return idb; + return workspace; } public override async createWorkspace( @@ -252,7 +256,7 @@ export class AffineProvider extends BaseProvider { room: id, }).register(BlockSchema); nw.meta.setName(meta.name); - this._initWorkspaceDb(nw); + this.linkLocal(nw); const workspaceInfo: WS = { name: meta.name, diff --git a/packages/data-center/src/provider/base.ts b/packages/data-center/src/provider/base.ts index 249a536f21..5f531e2940 100644 --- a/packages/data-center/src/provider/base.ts +++ b/packages/data-center/src/provider/base.ts @@ -169,4 +169,13 @@ export class BaseProvider { email; return null; } + + /** + * link workspace to local caches + * @param workspace + * @returns + */ + public async linkLocal(workspace: Workspace): Promise { + return workspace; + } } diff --git a/packages/data-center/src/provider/local/local.ts b/packages/data-center/src/provider/local/local.ts index fb73ccce42..10df431481 100644 --- a/packages/data-center/src/provider/local/local.ts +++ b/packages/data-center/src/provider/local/local.ts @@ -22,21 +22,21 @@ export class LocalProvider extends BaseProvider { storage.setItem(WORKSPACE_KEY, JSON.stringify(workspaces)); } - private async _initWorkspaceDb(workspace: Workspace) { + public override async linkLocal(workspace: Workspace) { assert(workspace.room); let idb = this._idbMap.get(workspace.room); idb?.destroy(); idb = new IndexedDBProvider(workspace.room, workspace.doc); this._idbMap.set(workspace.room, idb); this._logger('Local data loaded'); - return idb; + return workspace; } public override async warpWorkspace( workspace: Workspace ): Promise { assert(workspace.room); - await this._initWorkspaceDb(workspace); + await this.linkLocal(workspace); return workspace; } @@ -93,7 +93,7 @@ export class LocalProvider extends BaseProvider { }; const workspace = new Workspace({ room: workspaceInfo.id }); - this._initWorkspaceDb(workspace); + this.linkLocal(workspace); workspace.meta.setName(meta.name); if (!meta.avatar) { // set default avatar From f7ff8f29b8a8e46bc1658aa14b807e20a10d99d4 Mon Sep 17 00:00:00 2001 From: alt0 Date: Mon, 9 Jan 2023 17:04:31 +0800 Subject: [PATCH 08/33] fix: test case for delete workspace --- packages/data-center/src/provider/local/local.spec.ts | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/data-center/src/provider/local/local.spec.ts b/packages/data-center/src/provider/local/local.spec.ts index f6a7c764ec..d1778f5b0f 100644 --- a/packages/data-center/src/provider/local/local.spec.ts +++ b/packages/data-center/src/provider/local/local.spec.ts @@ -48,10 +48,13 @@ test.describe.serial('local provider', () => { expect(workspaces.workspaces.length).toEqual(1); /** * FIXME - * Running following code will crash the worker, and get error like next line: + * If we don't wrap setTimeout, + * Running deleteWorkspace will crash the worker, and get error like next line: * InvalidStateError: An operation was called on an object on which it is not allowed or at a time when it is not allowed. Also occurs if a request is made on a source object that has been deleted or removed. Use TransactionInactiveError or ReadOnlyError when possible, as they are more specific variations of InvalidStateError. * */ - // await provider.deleteWorkspace(workspaces.workspaces[0].id); - // expect(workspaces.workspaces.length).toEqual(0); + setTimeout(async () => { + await provider.deleteWorkspace(workspaces.workspaces[0].id); + expect(workspaces.workspaces.length).toEqual(0); + }, 10); }); }); From 44008719592e0f52d1037280034e969b2ac05a71 Mon Sep 17 00:00:00 2001 From: alt0 Date: Mon, 9 Jan 2023 17:05:10 +0800 Subject: [PATCH 09/33] fix: remove type error --- packages/data-center/src/provider/local/local.spec.ts | 3 --- 1 file changed, 3 deletions(-) diff --git a/packages/data-center/src/provider/local/local.spec.ts b/packages/data-center/src/provider/local/local.spec.ts index d1778f5b0f..f24f118ffb 100644 --- a/packages/data-center/src/provider/local/local.spec.ts +++ b/packages/data-center/src/provider/local/local.spec.ts @@ -2,13 +2,11 @@ import { test, expect } from '@playwright/test'; import { Workspaces } from '../../workspaces/index.js'; import { LocalProvider } from './local.js'; import 'fake-indexeddb/auto'; -import { BlobStorage } from '@blocksuite/store'; test.describe.serial('local provider', () => { const workspaces = new Workspaces(); const provider = new LocalProvider({ workspaces: workspaces.createScope(), - blobs: new BlobStorage(), }); const workspaceName = 'workspace-test'; @@ -29,7 +27,6 @@ test.describe.serial('local provider', () => { const workspaces1 = new Workspaces(); const provider1 = new LocalProvider({ workspaces: workspaces1.createScope(), - blobs: new BlobStorage(), }); await provider1.loadWorkspaces(); expect(workspaces1.workspaces.length).toEqual(1); From dacfdfa57f16cd90c907e6490675af65f22d87af Mon Sep 17 00:00:00 2001 From: alt0 Date: Mon, 9 Jan 2023 17:15:19 +0800 Subject: [PATCH 10/33] refactor: remove unused files --- .../src/provider/{ => local}/indexeddb.ts | 0 .../data-center/src/provider/local/local.ts | 2 +- .../src/workspaces/workspaces.ts.bak | 101 ------------------ 3 files changed, 1 insertion(+), 102 deletions(-) rename packages/data-center/src/provider/{ => local}/indexeddb.ts (100%) delete mode 100644 packages/data-center/src/workspaces/workspaces.ts.bak diff --git a/packages/data-center/src/provider/indexeddb.ts b/packages/data-center/src/provider/local/indexeddb.ts similarity index 100% rename from packages/data-center/src/provider/indexeddb.ts rename to packages/data-center/src/provider/local/indexeddb.ts diff --git a/packages/data-center/src/provider/local/local.ts b/packages/data-center/src/provider/local/local.ts index 10df431481..82ffe77741 100644 --- a/packages/data-center/src/provider/local/local.ts +++ b/packages/data-center/src/provider/local/local.ts @@ -3,7 +3,7 @@ import type { ProviderConstructorParams } from '../base'; import { varStorage as storage } from 'lib0/storage'; import { Workspace as WS, WorkspaceMeta } from '../../types'; import { Workspace, uuidv4 } from '@blocksuite/store'; -import { IndexedDBProvider } from '../indexeddb.js'; +import { IndexedDBProvider } from './indexeddb.js'; import assert from 'assert'; import { getDefaultHeadImgBlob } from '../../utils/index.js'; diff --git a/packages/data-center/src/workspaces/workspaces.ts.bak b/packages/data-center/src/workspaces/workspaces.ts.bak deleted file mode 100644 index f813f6b16d..0000000000 --- a/packages/data-center/src/workspaces/workspaces.ts.bak +++ /dev/null @@ -1,101 +0,0 @@ -import { Workspace as WS } from '../types'; - -import { Observable } from 'lib0/observable'; -import { uuidv4 } from '@blocksuite/store'; -import { DataCenter } from '../datacenter'; - -export class Workspaces extends Observable { - private _workspaces: WS[]; - private readonly _dc: DataCenter; - - constructor(dc: DataCenter) { - super(); - this._workspaces = []; - this._dc = dc; - } - - public init() { - this._loadWorkspaces(); - } - - get workspaces() { - return this._workspaces; - } - - /** - * emit when workspaces changed - * @param {(workspace: WS[]) => void} cb - */ - onWorkspacesChange(cb: (workspace: WS[]) => void) { - this.on('change', cb); - } - - private async _loadWorkspaces() { - const providers = this._dc.providers; - let workspaces: WS[] = []; - providers.forEach(async p => { - const pWorkspaces = await p.loadWorkspaces(); - workspaces = [...workspaces, ...pWorkspaces]; - this._updateWorkspaces([...workspaces, ...pWorkspaces]); - }); - } - - /** - * focus load all workspaces list - */ - public async refreshWorkspaces() { - this._loadWorkspaces(); - } - - private _updateWorkspaces(workspaces: WS[]) { - this._workspaces = workspaces; - this.emit('change', this._workspaces); - } - - private _getDefaultWorkspace(name: string): WS { - return { - name, - id: uuidv4(), - isPublish: false, - avatar: '', - owner: undefined, - isLocal: true, - memberCount: 1, - provider: 'local', - }; - } - - /** add a local workspaces */ - public addLocalWorkspace(name: string) { - const workspace = this._getDefaultWorkspace(name); - this._updateWorkspaces([...this._workspaces, workspace]); - return workspace; - } - - /** delete a workspaces by id */ - public delete(id: string) { - const index = this._workspaces.findIndex(w => w.id === id); - if (index >= 0) { - this._workspaces.splice(index, 1); - this._updateWorkspaces(this._workspaces); - } - } - - /** get workspace info by id */ - public getWorkspace(id: string) { - return this._workspaces.find(w => w.id === id); - } - - /** check if workspace exists */ - public hasWorkspace(id: string) { - return this._workspaces.some(w => w.id === id); - } - - public updateWorkspaceInfo(id: string, info: Partial) { - const index = this._workspaces.findIndex(w => w.id === id); - if (index >= 0) { - this._workspaces[index] = { ...this._workspaces[index], ...info }; - this._updateWorkspaces(this._workspaces); - } - } -} From 0b5cc1beda4f27cc67b5cd50917f27c6bdb6ac4f Mon Sep 17 00:00:00 2001 From: MingLiang Wang Date: Mon, 9 Jan 2023 17:18:58 +0800 Subject: [PATCH 11/33] feat: fix --- packages/data-center/src/datacenter.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/data-center/src/datacenter.ts b/packages/data-center/src/datacenter.ts index 907b0e310a..ee320d75ec 100644 --- a/packages/data-center/src/datacenter.ts +++ b/packages/data-center/src/datacenter.ts @@ -81,7 +81,7 @@ export class DataCenter { /** * create new workspace , new workspace is a local workspace * @param {string} name workspace name - * @returns {Promise} + * @returns {Promise} */ public async createWorkspace(workspaceMeta: WorkspaceMeta) { assert( From d10affb41334aec380c50ff9066cfc509583f916 Mon Sep 17 00:00:00 2001 From: MingLiang Wang Date: Mon, 9 Jan 2023 17:27:08 +0800 Subject: [PATCH 12/33] feat: disable local cache of affine provider --- .../data-center/src/provider/affine/affine.ts | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/packages/data-center/src/provider/affine/affine.ts b/packages/data-center/src/provider/affine/affine.ts index 28cb19f1f6..973eed1ddd 100644 --- a/packages/data-center/src/provider/affine/affine.ts +++ b/packages/data-center/src/provider/affine/affine.ts @@ -21,7 +21,7 @@ import { varStorage as storage } from 'lib0/storage'; import assert from 'assert'; import { getAuthorizer } from './apis/token'; import { WebsocketProvider } from './sync'; -import { IndexedDBProvider } from '../indexeddb'; +// import { IndexedDBProvider } from '../local/indexeddb'; import { getDefaultHeadImgBlob } from '../../utils'; import { getUserByEmail } from './apis/user'; @@ -32,7 +32,7 @@ export class AffineProvider extends BaseProvider { private readonly _authorizer = getAuthorizer(); private _user: User | undefined = undefined; private _wsMap: Map = new Map(); - private _idbMap: Map = new Map(); + // private _idbMap: Map = new Map(); constructor(params: ProviderConstructorParams) { super(params); @@ -197,7 +197,7 @@ export class AffineProvider extends BaseProvider { public override async deleteWorkspace(id: string): Promise { await this.closeWorkspace(id); - IndexedDBProvider.delete(id); + // IndexedDBProvider.delete(id); await deleteWorkspace({ id }); this._workspaces.remove(id); } @@ -217,8 +217,8 @@ export class AffineProvider extends BaseProvider { } public override async closeWorkspace(id: string) { - const idb = this._idbMap.get(id); - idb?.destroy(); + // const idb = this._idbMap.get(id); + // idb?.destroy(); const ws = this._wsMap.get(id); ws?.disconnect(); } @@ -236,14 +236,15 @@ export class AffineProvider extends BaseProvider { } public override async linkLocal(workspace: Workspace) { - assert(workspace.room); - let idb = this._idbMap.get(workspace.room); - idb?.destroy(); - idb = new IndexedDBProvider(workspace.room, workspace.doc); - this._idbMap.set(workspace.room, idb); - await idb.whenSynced; - this._logger('Local data loaded'); return workspace; + // assert(workspace.room); + // let idb = this._idbMap.get(workspace.room); + // idb?.destroy(); + // idb = new IndexedDBProvider(workspace.room, workspace.doc); + // this._idbMap.set(workspace.room, idb); + // await idb.whenSynced; + // this._logger('Local data loaded'); + // return workspace; } public override async createWorkspace( From 5095e2f27d945ad0aa9df7e526d9da82ac93748c Mon Sep 17 00:00:00 2001 From: alt0 Date: Mon, 9 Jan 2023 17:41:03 +0800 Subject: [PATCH 13/33] refactor: inject apis to affine --- .../data-center/src/provider/affine/affine.ts | 48 +++++++++---------- .../src/provider/affine/apis/index.ts | 2 +- 2 files changed, 24 insertions(+), 26 deletions(-) diff --git a/packages/data-center/src/provider/affine/affine.ts b/packages/data-center/src/provider/affine/affine.ts index 973eed1ddd..d86c42f9fa 100644 --- a/packages/data-center/src/provider/affine/affine.ts +++ b/packages/data-center/src/provider/affine/affine.ts @@ -1,15 +1,3 @@ -import { - getWorkspaces, - getWorkspaceDetail, - WorkspaceDetail, - downloadWorkspace, - deleteWorkspace, - leaveWorkspace, - inviteMember, - removeMember, - createWorkspace, - updateWorkspace, -} from './apis/workspace'; import { BaseProvider } from '../base'; import type { ProviderConstructorParams } from '../base'; import { User, Workspace as WS, WorkspaceMeta } from '../../types'; @@ -23,7 +11,13 @@ import { getAuthorizer } from './apis/token'; import { WebsocketProvider } from './sync'; // import { IndexedDBProvider } from '../local/indexeddb'; import { getDefaultHeadImgBlob } from '../../utils'; -import { getUserByEmail } from './apis/user'; +import { getApis } from './apis/index.js'; +import type { Apis, WorkspaceDetail } from './apis'; + +export interface AffineProviderConstructorParams + extends ProviderConstructorParams { + apis?: Apis; +} export class AffineProvider extends BaseProvider { public id = 'affine'; @@ -32,10 +26,12 @@ export class AffineProvider extends BaseProvider { private readonly _authorizer = getAuthorizer(); private _user: User | undefined = undefined; private _wsMap: Map = new Map(); + private _apis: Apis; // private _idbMap: Map = new Map(); - constructor(params: ProviderConstructorParams) { + constructor({ apis, ...params }: AffineProviderConstructorParams) { super(params); + this._apis = apis || getApis(); } override async init() { @@ -70,7 +66,7 @@ export class AffineProvider extends BaseProvider { const { doc, room } = workspace; assert(room); this.linkLocal(workspace); - const updates = await downloadWorkspace(room); + const updates = await this._apis.downloadWorkspace(room); if (updates) { await new Promise(resolve => { doc.once('update', resolve); @@ -98,7 +94,7 @@ export class AffineProvider extends BaseProvider { if (!token.isLogin) { return []; } - const workspacesList = await getWorkspaces(); + const workspacesList = await this._apis.getWorkspaces(); const workspaces: WS[] = workspacesList.map(w => { return { ...w, @@ -116,7 +112,7 @@ export class AffineProvider extends BaseProvider { this._workspacesCache.set(id, workspace); if (workspace) { return new Promise(resolve => { - downloadWorkspace(id).then(data => { + this._apis.downloadWorkspace(id).then(data => { applyUpdate(workspace.doc, new Uint8Array(data)); resolve(workspace); }); @@ -139,7 +135,7 @@ export class AffineProvider extends BaseProvider { const { id } = w; return new Promise<{ id: string; detail: WorkspaceDetail | null }>( resolve => { - getWorkspaceDetail({ id }).then(data => { + this._apis.getWorkspaceDetail({ id }).then(data => { resolve({ id, detail: data || null }); }); } @@ -198,7 +194,7 @@ export class AffineProvider extends BaseProvider { public override async deleteWorkspace(id: string): Promise { await this.closeWorkspace(id); // IndexedDBProvider.delete(id); - await deleteWorkspace({ id }); + await this._apis.deleteWorkspace({ id }); this._workspaces.remove(id); } @@ -224,15 +220,15 @@ export class AffineProvider extends BaseProvider { } public override async leaveWorkspace(id: string): Promise { - await leaveWorkspace({ id }); + await this._apis.leaveWorkspace({ id }); } public override async invite(id: string, email: string): Promise { - return await inviteMember({ id, email }); + return await this._apis.inviteMember({ id, email }); } public override async removeMember(permissionId: number): Promise { - return await removeMember({ permissionId }); + return await this._apis.removeMember({ permissionId }); } public override async linkLocal(workspace: Workspace) { @@ -251,7 +247,9 @@ export class AffineProvider extends BaseProvider { meta: WorkspaceMeta ): Promise { assert(meta.name, 'Workspace name is required'); - const { id } = await createWorkspace(meta as Required); + const { id } = await this._apis.createWorkspace( + meta as Required + ); this._logger('Creating affine workspace'); const nw = new Workspace({ room: id, @@ -287,14 +285,14 @@ export class AffineProvider extends BaseProvider { } public override async publish(id: string, isPublish: boolean): Promise { - await updateWorkspace({ id, public: isPublish }); + await this._apis.updateWorkspace({ id, public: isPublish }); } public override async getUserByEmail( workspace_id: string, email: string ): Promise { - const user = await getUserByEmail({ workspace_id, email }); + const user = await this._apis.getUserByEmail({ workspace_id, email }); return user ? { id: user.id, diff --git a/packages/data-center/src/provider/affine/apis/index.ts b/packages/data-center/src/provider/affine/apis/index.ts index 28e49b02a7..8c627519a0 100644 --- a/packages/data-center/src/provider/affine/apis/index.ts +++ b/packages/data-center/src/provider/affine/apis/index.ts @@ -22,5 +22,5 @@ export const getApis = (): Apis => { }; export type { AccessTokenMessage } from './token'; -export type { Member, Workspace } from './workspace'; +export type { Member, Workspace, WorkspaceDetail } from './workspace'; export { WorkspaceType } from './workspace.js'; From bd5f0ad7c189cce006929df178e9edf728a87624 Mon Sep 17 00:00:00 2001 From: MingLiang Wang Date: Mon, 9 Jan 2023 17:52:38 +0800 Subject: [PATCH 14/33] feat: add disconnect ws --- packages/data-center/src/provider/affine/affine.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/data-center/src/provider/affine/affine.ts b/packages/data-center/src/provider/affine/affine.ts index d86c42f9fa..41f438d88f 100644 --- a/packages/data-center/src/provider/affine/affine.ts +++ b/packages/data-center/src/provider/affine/affine.ts @@ -78,6 +78,12 @@ export class AffineProvider extends BaseProvider { ws = new WebsocketProvider('/', room, doc); this._wsMap.set(room, ws); } + // close all websocket links + Array.from(this._wsMap.entries()).forEach(([id, ws]) => { + if (id !== room) { + ws.disconnect(); + } + }); ws.connect(); await new Promise((resolve, reject) => { // TODO: synced will also be triggered on reconnection after losing sync From 9316bb422275387eda9fc141c15f4e843935c345 Mon Sep 17 00:00:00 2001 From: alt0 Date: Mon, 9 Jan 2023 18:53:15 +0800 Subject: [PATCH 15/33] test: add test case for affine --- .../provider/affine/__tests__/affine.spec.ts | 53 ++++++++++++++++ .../provider/affine/__tests__/mock-apis.ts | 19 ++++++ .../data-center/src/provider/affine/affine.ts | 60 +++++++++---------- .../src/provider/affine/apis/index.ts | 6 +- .../src/provider/affine/apis/token.ts | 8 ++- .../src/provider/affine/storage.ts | 1 + 6 files changed, 112 insertions(+), 35 deletions(-) create mode 100644 packages/data-center/src/provider/affine/__tests__/affine.spec.ts create mode 100644 packages/data-center/src/provider/affine/__tests__/mock-apis.ts create mode 100644 packages/data-center/src/provider/affine/storage.ts diff --git a/packages/data-center/src/provider/affine/__tests__/affine.spec.ts b/packages/data-center/src/provider/affine/__tests__/affine.spec.ts new file mode 100644 index 0000000000..46e735e955 --- /dev/null +++ b/packages/data-center/src/provider/affine/__tests__/affine.spec.ts @@ -0,0 +1,53 @@ +import { test, expect } from '@playwright/test'; +import { AffineProvider } from '../affine.js'; +import { Workspaces } from '../../../workspaces/index.js'; +import { apis } from './mock-apis.js'; +import 'fake-indexeddb/auto'; + +test.describe.serial('affine provider', async () => { + const workspaces = new Workspaces(); + const provider = new AffineProvider({ + workspaces: workspaces.createScope(), + apis, + }); + + await provider.auth(); + + const workspaceName = 'workspace-test'; + let workspaceId: string | undefined; + + test('create workspace', async () => { + const w = await provider.createWorkspace({ + name: workspaceName, + avatar: 'avatar-url-test', + }); + workspaceId = w?.room; + + expect(workspaces.workspaces.length).toEqual(1); + expect(workspaces.workspaces[0].name).toEqual(workspaceName); + }); + + // test('workspace list cache', async () => { + // const workspaces1 = new Workspaces(); + // const provider1 = new AffineProvider({ + // workspaces: workspaces1.createScope(), + // }); + // await provider1.loadWorkspaces(); + // expect(workspaces1.workspaces.length).toEqual(1); + // expect(workspaces1.workspaces[0].name).toEqual(workspaceName); + // expect(workspaces1.workspaces[0].id).toEqual(workspaceId); + // }); + + // test('update workspace', async () => { + // await provider.updateWorkspaceMeta(workspaceId!, { + // name: '1111', + // }); + // expect(workspaces.workspaces[0].name).toEqual('1111'); + // }); + + // test('delete workspace', async () => { + // expect(workspaces.workspaces.length).toEqual(1); + // await provider.deleteWorkspace(workspaces.workspaces[0].id); + // expect(workspaces.workspaces.length).toEqual(0); + // }); +}); diff --git a/packages/data-center/src/provider/affine/__tests__/mock-apis.ts b/packages/data-center/src/provider/affine/__tests__/mock-apis.ts new file mode 100644 index 0000000000..b05b9cd663 --- /dev/null +++ b/packages/data-center/src/provider/affine/__tests__/mock-apis.ts @@ -0,0 +1,19 @@ +import type { Apis, AccessTokenMessage } from '../apis'; + +const user: AccessTokenMessage = { + create_at: Date.now(), + exp: 100000000, + email: 'demo@demo.demo', + id: '123', + name: 'demo', + avatar_url: 'demo-avatar-url', +}; + +export const apis = { + signInWithGoogle: () => { + return Promise.resolve(user); + }, + createWorkspace: mate => { + return Promise.resolve({ id: 'test' }); + }, +} as Apis; diff --git a/packages/data-center/src/provider/affine/affine.ts b/packages/data-center/src/provider/affine/affine.ts index d86c42f9fa..f2d99cb833 100644 --- a/packages/data-center/src/provider/affine/affine.ts +++ b/packages/data-center/src/provider/affine/affine.ts @@ -1,18 +1,16 @@ -import { BaseProvider } from '../base'; +import { BaseProvider } from '../base.js'; import type { ProviderConstructorParams } from '../base'; -import { User, Workspace as WS, WorkspaceMeta } from '../../types'; +import type { User, Workspace as WS, WorkspaceMeta } from '../../types'; import { Workspace } from '@blocksuite/store'; import { BlockSchema } from '@blocksuite/blocks/models'; import { applyUpdate } from 'yjs'; -import { token, Callback } from './apis'; -import { varStorage as storage } from 'lib0/storage'; +import { storage } from './storage.js'; import assert from 'assert'; -import { getAuthorizer } from './apis/token'; -import { WebsocketProvider } from './sync'; +import { WebsocketProvider } from './sync.js'; // import { IndexedDBProvider } from '../local/indexeddb'; -import { getDefaultHeadImgBlob } from '../../utils'; +import { getDefaultHeadImgBlob } from '../../utils/index.js'; import { getApis } from './apis/index.js'; -import type { Apis, WorkspaceDetail } from './apis'; +import type { Apis, WorkspaceDetail, Callback } from './apis'; export interface AffineProviderConstructorParams extends ProviderConstructorParams { @@ -23,8 +21,6 @@ export class AffineProvider extends BaseProvider { public id = 'affine'; private _workspacesCache: Map = new Map(); private _onTokenRefresh?: Callback = undefined; - private readonly _authorizer = getAuthorizer(); - private _user: User | undefined = undefined; private _wsMap: Map = new Map(); private _apis: Apis; // private _idbMap: Map = new Map(); @@ -36,29 +32,29 @@ export class AffineProvider extends BaseProvider { override async init() { this._onTokenRefresh = () => { - if (token.refresh) { - storage.setItem('token', token.refresh); + if (this._apis.token.refresh) { + storage.setItem('token', this._apis.token.refresh); } }; - token.onChange(this._onTokenRefresh); + this._apis.token.onChange(this._onTokenRefresh); // initial login token - if (token.isExpired) { + if (this._apis.token.isExpired) { try { const refreshToken = storage.getItem('token'); - await token.refreshToken(refreshToken); + await this._apis.token.refreshToken(refreshToken); - if (token.refresh) { - storage.set('token', token.refresh); + if (this._apis.token.refresh) { + storage.set('token', this._apis.token.refresh); } - assert(token.isLogin); + assert(this._apis.token.isLogin); } catch (_) { // this._logger('Authorization failed, fallback to local mode'); } } else { - storage.setItem('token', token.refresh); + storage.setItem('token', this._apis.token.refresh); } } @@ -91,7 +87,7 @@ export class AffineProvider extends BaseProvider { } override async loadWorkspaces() { - if (!token.isLogin) { + if (!this._apis.token.isLogin) { return []; } const workspacesList = await this._apis.getWorkspaces(); @@ -171,24 +167,26 @@ export class AffineProvider extends BaseProvider { override async auth() { const refreshToken = await storage.getItem('token'); if (refreshToken) { - await token.refreshToken(refreshToken); - if (token.isLogin && !token.isExpired) { + await this._apis.token.refreshToken(refreshToken); + if (this._apis.token.isLogin && !this._apis.token.isExpired) { // login success return; } } - const user = await this._authorizer[0]?.(); + const user = await this._apis.signInWithGoogle?.(); assert(user); - this._user = { - id: user.id, - name: user.name, - avatar: user.avatar_url, - email: user.email, - }; } public override async getUserInfo(): Promise { - return this._user; + const user = this._apis.token.user; + return user + ? { + id: user.id, + name: user.name, + avatar: user.avatar_url, + email: user.email, + } + : undefined; } public override async deleteWorkspace(id: string): Promise { @@ -265,7 +263,7 @@ export class AffineProvider extends BaseProvider { owner: undefined, isLocal: true, memberCount: 1, - provider: 'local', + provider: 'affine', }; if (!meta.avatar) { diff --git a/packages/data-center/src/provider/affine/apis/index.ts b/packages/data-center/src/provider/affine/apis/index.ts index 8c627519a0..21d0c8e737 100644 --- a/packages/data-center/src/provider/affine/apis/index.ts +++ b/packages/data-center/src/provider/affine/apis/index.ts @@ -1,15 +1,16 @@ -export { token } from './token.js'; +// export { token } from './token.js'; export type { Callback } from './token.js'; import { getAuthorizer } from './token.js'; import * as user from './user.js'; import * as workspace from './workspace.js'; +import { token } from './token.js'; export type Apis = typeof user & typeof workspace & { signInWithGoogle: ReturnType[0]; onAuthStateChanged: ReturnType[1]; - }; + } & { token: typeof token }; export const getApis = (): Apis => { const [signInWithGoogle, onAuthStateChanged] = getAuthorizer(); @@ -18,6 +19,7 @@ export const getApis = (): Apis => { ...workspace, signInWithGoogle, onAuthStateChanged, + token, }; }; diff --git a/packages/data-center/src/provider/affine/apis/token.ts b/packages/data-center/src/provider/affine/apis/token.ts index d7a2c34f87..3ab36adbf0 100644 --- a/packages/data-center/src/provider/affine/apis/token.ts +++ b/packages/data-center/src/provider/affine/apis/token.ts @@ -2,8 +2,8 @@ import { initializeApp } from 'firebase/app'; import { getAuth, GoogleAuthProvider, signInWithPopup } from 'firebase/auth'; import type { User } from 'firebase/auth'; -import { getLogger } from '../../../logger'; -import { bareClient } from './request'; +import { getLogger } from '../../../logger.js'; +import { bareClient } from './request.js'; export interface AccessTokenMessage { create_at: number; @@ -46,6 +46,10 @@ class Token { this._setToken(); // fill with default value } + get user() { + return this._user; + } + private _setToken(login?: LoginResponse) { this._accessToken = login?.token || ''; this._refreshToken = login?.refresh || ''; diff --git a/packages/data-center/src/provider/affine/storage.ts b/packages/data-center/src/provider/affine/storage.ts new file mode 100644 index 0000000000..4ac1b74697 --- /dev/null +++ b/packages/data-center/src/provider/affine/storage.ts @@ -0,0 +1 @@ +export { varStorage as storage } from 'lib0/storage'; From 72a39f67c01f1a7d79c4f77f90efd31579bcbc84 Mon Sep 17 00:00:00 2001 From: alt0 Date: Mon, 9 Jan 2023 20:48:50 +0800 Subject: [PATCH 16/33] fix: types; empty check --- packages/data-center/src/provider/affine/affine.ts | 2 +- packages/data-center/src/provider/affine/apis/index.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/data-center/src/provider/affine/affine.ts b/packages/data-center/src/provider/affine/affine.ts index cb567bc8f5..597fa24289 100644 --- a/packages/data-center/src/provider/affine/affine.ts +++ b/packages/data-center/src/provider/affine/affine.ts @@ -63,7 +63,7 @@ export class AffineProvider extends BaseProvider { assert(room); this.linkLocal(workspace); const updates = await this._apis.downloadWorkspace(room); - if (updates) { + if (updates && updates.byteLength) { await new Promise(resolve => { doc.once('update', resolve); applyUpdate(doc, new Uint8Array(updates)); diff --git a/packages/data-center/src/provider/affine/apis/index.ts b/packages/data-center/src/provider/affine/apis/index.ts index 21d0c8e737..d3ac780887 100644 --- a/packages/data-center/src/provider/affine/apis/index.ts +++ b/packages/data-center/src/provider/affine/apis/index.ts @@ -7,7 +7,7 @@ import * as workspace from './workspace.js'; import { token } from './token.js'; export type Apis = typeof user & - typeof workspace & { + Omit & { signInWithGoogle: ReturnType[0]; onAuthStateChanged: ReturnType[1]; } & { token: typeof token }; From 0a4a9fcdb14da6de6e93faab50a1ef49e6731c88 Mon Sep 17 00:00:00 2001 From: alt0 Date: Mon, 9 Jan 2023 21:10:04 +0800 Subject: [PATCH 17/33] refactor: rename BlocksuiteWorkspace and WorkspaceInfo --- packages/data-center/src/datacenter.ts | 23 ++++++++++-------- packages/data-center/src/index.ts | 2 +- .../data-center/src/provider/affine/affine.ts | 22 ++++++++--------- packages/data-center/src/provider/base.ts | 16 ++++++++----- .../data-center/src/provider/local/local.ts | 24 +++++++++---------- packages/data-center/src/types/index.ts | 4 ++-- .../data-center/src/workspaces/workspaces.ts | 22 ++++++++--------- 7 files changed, 60 insertions(+), 53 deletions(-) diff --git a/packages/data-center/src/datacenter.ts b/packages/data-center/src/datacenter.ts index ee320d75ec..1021a4afb3 100644 --- a/packages/data-center/src/datacenter.ts +++ b/packages/data-center/src/datacenter.ts @@ -1,6 +1,6 @@ import { Workspaces } from './workspaces'; import type { WorkspacesChangeEvent } from './workspaces'; -import { Workspace } from '@blocksuite/store'; +import { Workspace as BlocksuiteWorkspace } from '@blocksuite/store'; import { BaseProvider } from './provider/base'; import { LocalProvider } from './provider/local/local'; import { AffineProvider } from './provider'; @@ -17,7 +17,7 @@ import { applyUpdate, encodeStateAsUpdate } from 'yjs'; export class DataCenter { private readonly _workspaces = new Workspaces(); private readonly _logger = getLogger('dc'); - private _workspaceInstances: Map = new Map(); + private _workspaceInstances: Map = new Map(); /** * A mainProvider must exist as the only data trustworthy source. */ @@ -114,7 +114,7 @@ export class DataCenter { assert(workspaceInfo, 'Workspace not found'); return ( this._workspaceInstances.get(workspaceId) || - new Workspace({ + new BlocksuiteWorkspace({ room: workspaceId, }).register(BlockSchema) ); @@ -143,7 +143,7 @@ export class DataCenter { /** * load workspace instance by id * @param {string} workspaceId workspace id - * @returns {Promise} + * @returns {Promise} */ public async loadWorkspace(workspaceId: string) { const workspaceInfo = this._workspaces.find(workspaceId); @@ -185,11 +185,11 @@ export class DataCenter { /** * change workspaces meta * @param {WorkspaceMeta} workspaceMeta workspace meta - * @param {Workspace} workspace workspace instance + * @param {BlocksuiteWorkspace} workspace workspace instance */ public async resetWorkspaceMeta( { name, avatar }: WorkspaceMeta, - workspace: Workspace + workspace: BlocksuiteWorkspace ) { assert(workspace?.room, 'No workspace to set meta'); const update: Partial = {}; @@ -273,7 +273,7 @@ export class DataCenter { } private async _transWorkspaceProvider( - workspace: Workspace, + workspace: BlocksuiteWorkspace, providerId: string ) { assert(workspace.room, 'No workspace id'); @@ -306,7 +306,7 @@ export class DataCenter { * Enable workspace cloud * @param {string} id ID of workspace. */ - public async enableWorkspaceCloud(workspace: Workspace) { + public async enableWorkspaceCloud(workspace: BlocksuiteWorkspace) { assert(workspace?.room, 'No workspace to enable cloud'); return await this._transWorkspaceProvider(workspace, 'affine'); } @@ -344,7 +344,10 @@ export class DataCenter { * @param id * @returns {Promise} blob url */ - async getBlob(workspace: Workspace, id: string): Promise { + async getBlob( + workspace: BlocksuiteWorkspace, + id: string + ): Promise { const blob = await workspace.blobs; return (await blob?.get(id)) || ''; } @@ -354,7 +357,7 @@ export class DataCenter { * @param id * @returns {Promise} blob url */ - async setBlob(workspace: Workspace, blob: Blob): Promise { + async setBlob(workspace: BlocksuiteWorkspace, blob: Blob): Promise { const blobStorage = await workspace.blobs; return (await blobStorage?.set(blob)) || ''; } diff --git a/packages/data-center/src/index.ts b/packages/data-center/src/index.ts index 6fbb0e45db..f07335c0d1 100644 --- a/packages/data-center/src/index.ts +++ b/packages/data-center/src/index.ts @@ -26,5 +26,5 @@ const _initializeDataCenter = () => { export const getDataCenter = _initializeDataCenter(); export type { AccessTokenMessage } from './provider/affine/apis'; -export type { Workspace } from './types'; +export type { WorkspaceInfo } from './types'; export { getLogger } from './logger'; diff --git a/packages/data-center/src/provider/affine/affine.ts b/packages/data-center/src/provider/affine/affine.ts index 597fa24289..6cb876a523 100644 --- a/packages/data-center/src/provider/affine/affine.ts +++ b/packages/data-center/src/provider/affine/affine.ts @@ -1,7 +1,7 @@ import { BaseProvider } from '../base.js'; import type { ProviderConstructorParams } from '../base'; -import type { User, Workspace as WS, WorkspaceMeta } from '../../types'; -import { Workspace } from '@blocksuite/store'; +import type { User, WorkspaceInfo, WorkspaceMeta } from '../../types'; +import { Workspace as BlocksuiteWorkspace } from '@blocksuite/store'; import { BlockSchema } from '@blocksuite/blocks/models'; import { applyUpdate } from 'yjs'; import { storage } from './storage.js'; @@ -19,7 +19,7 @@ export interface AffineProviderConstructorParams export class AffineProvider extends BaseProvider { public id = 'affine'; - private _workspacesCache: Map = new Map(); + private _workspacesCache: Map = new Map(); private _onTokenRefresh?: Callback = undefined; private _wsMap: Map = new Map(); private _apis: Apis; @@ -58,7 +58,7 @@ export class AffineProvider extends BaseProvider { } } - override async warpWorkspace(workspace: Workspace) { + override async warpWorkspace(workspace: BlocksuiteWorkspace) { const { doc, room } = workspace; assert(room); this.linkLocal(workspace); @@ -97,7 +97,7 @@ export class AffineProvider extends BaseProvider { return []; } const workspacesList = await this._apis.getWorkspaces(); - const workspaces: WS[] = workspacesList.map(w => { + const workspaces: WorkspaceInfo[] = workspacesList.map(w => { return { ...w, memberCount: 0, @@ -108,12 +108,12 @@ export class AffineProvider extends BaseProvider { const workspaceInstances = workspaces.map(({ id }) => { const workspace = this._workspacesCache.get(id) || - new Workspace({ + new BlocksuiteWorkspace({ room: id, }).register(BlockSchema); this._workspacesCache.set(id, workspace); if (workspace) { - return new Promise(resolve => { + return new Promise(resolve => { this._apis.downloadWorkspace(id).then(data => { applyUpdate(workspace.doc, new Uint8Array(data)); resolve(workspace); @@ -235,7 +235,7 @@ export class AffineProvider extends BaseProvider { return await this._apis.removeMember({ permissionId }); } - public override async linkLocal(workspace: Workspace) { + public override async linkLocal(workspace: BlocksuiteWorkspace) { return workspace; // assert(workspace.room); // let idb = this._idbMap.get(workspace.room); @@ -249,19 +249,19 @@ export class AffineProvider extends BaseProvider { public override async createWorkspace( meta: WorkspaceMeta - ): Promise { + ): Promise { assert(meta.name, 'Workspace name is required'); const { id } = await this._apis.createWorkspace( meta as Required ); this._logger('Creating affine workspace'); - const nw = new Workspace({ + const nw = new BlocksuiteWorkspace({ room: id, }).register(BlockSchema); nw.meta.setName(meta.name); this.linkLocal(nw); - const workspaceInfo: WS = { + const workspaceInfo: WorkspaceInfo = { name: meta.name, id, isPublish: false, diff --git a/packages/data-center/src/provider/base.ts b/packages/data-center/src/provider/base.ts index 5f531e2940..966141f504 100644 --- a/packages/data-center/src/provider/base.ts +++ b/packages/data-center/src/provider/base.ts @@ -1,5 +1,5 @@ -import { BlobStorage, Workspace } from '@blocksuite/store'; -import { Logger, User, Workspace as WS, WorkspaceMeta } from '../types'; +import { Workspace as BlocksuiteWorkspace } from '@blocksuite/store'; +import { Logger, User, WorkspaceInfo, WorkspaceMeta } from '../types'; import type { WorkspacesScope } from '../workspaces'; const defaultLogger = () => { @@ -47,14 +47,16 @@ export class BaseProvider { * @param workspace * @returns */ - public async warpWorkspace(workspace: Workspace): Promise { + public async warpWorkspace( + workspace: BlocksuiteWorkspace + ): Promise { return workspace; } /** * load workspaces **/ - public async loadWorkspaces(): Promise { + public async loadWorkspaces(): Promise { throw new Error(`provider: ${this.id} loadWorkSpace Not implemented`); } @@ -154,7 +156,7 @@ export class BaseProvider { */ public async createWorkspace( meta: WorkspaceMeta - ): Promise { + ): Promise { meta; return; } @@ -175,7 +177,9 @@ export class BaseProvider { * @param workspace * @returns */ - public async linkLocal(workspace: Workspace): Promise { + public async linkLocal( + workspace: BlocksuiteWorkspace + ): Promise { return workspace; } } diff --git a/packages/data-center/src/provider/local/local.ts b/packages/data-center/src/provider/local/local.ts index 82ffe77741..2d368fdf5c 100644 --- a/packages/data-center/src/provider/local/local.ts +++ b/packages/data-center/src/provider/local/local.ts @@ -1,8 +1,8 @@ import { BaseProvider } from '../base.js'; import type { ProviderConstructorParams } from '../base'; import { varStorage as storage } from 'lib0/storage'; -import { Workspace as WS, WorkspaceMeta } from '../../types'; -import { Workspace, uuidv4 } from '@blocksuite/store'; +import { WorkspaceInfo, WorkspaceMeta } from '../../types'; +import { Workspace as BlocksuiteWorkspace, uuidv4 } from '@blocksuite/store'; import { IndexedDBProvider } from './indexeddb.js'; import assert from 'assert'; import { getDefaultHeadImgBlob } from '../../utils/index.js'; @@ -18,11 +18,11 @@ export class LocalProvider extends BaseProvider { this.loadWorkspaces(); } - private _storeWorkspaces(workspaces: WS[]) { + private _storeWorkspaces(workspaces: WorkspaceInfo[]) { storage.setItem(WORKSPACE_KEY, JSON.stringify(workspaces)); } - public override async linkLocal(workspace: Workspace) { + public override async linkLocal(workspace: BlocksuiteWorkspace) { assert(workspace.room); let idb = this._idbMap.get(workspace.room); idb?.destroy(); @@ -33,19 +33,19 @@ export class LocalProvider extends BaseProvider { } public override async warpWorkspace( - workspace: Workspace - ): Promise { + workspace: BlocksuiteWorkspace + ): Promise { assert(workspace.room); await this.linkLocal(workspace); return workspace; } - override loadWorkspaces(): Promise { + override loadWorkspaces(): Promise { const workspaceStr = storage.getItem(WORKSPACE_KEY); - let workspaces: WS[] = []; + let workspaces: WorkspaceInfo[] = []; if (workspaceStr) { try { - workspaces = JSON.parse(workspaceStr) as WS[]; + workspaces = JSON.parse(workspaceStr) as WorkspaceInfo[]; workspaces.forEach(workspace => { this._workspaces.add(workspace); }); @@ -77,11 +77,11 @@ export class LocalProvider extends BaseProvider { public override async createWorkspace( meta: WorkspaceMeta - ): Promise { + ): Promise { assert(meta.name, 'Workspace name is required'); this._logger('Creating affine workspace'); - const workspaceInfo: WS = { + const workspaceInfo: WorkspaceInfo = { name: meta.name, id: uuidv4(), isPublish: false, @@ -92,7 +92,7 @@ export class LocalProvider extends BaseProvider { provider: 'local', }; - const workspace = new Workspace({ room: workspaceInfo.id }); + const workspace = new BlocksuiteWorkspace({ room: workspaceInfo.id }); this.linkLocal(workspace); workspace.meta.setName(meta.name); if (!meta.avatar) { diff --git a/packages/data-center/src/types/index.ts b/packages/data-center/src/types/index.ts index 61bc12be81..1155ee325a 100644 --- a/packages/data-center/src/types/index.ts +++ b/packages/data-center/src/types/index.ts @@ -1,6 +1,6 @@ import { getLogger } from '../logger'; -export type Workspace = { +export type WorkspaceInfo = { name: string; id: string; isPublish?: boolean; @@ -18,6 +18,6 @@ export type User = { avatar: string; }; -export type WorkspaceMeta = Pick; +export type WorkspaceMeta = Pick; export type Logger = ReturnType; diff --git a/packages/data-center/src/workspaces/workspaces.ts b/packages/data-center/src/workspaces/workspaces.ts index 90b1a5e9ea..d248951dc7 100644 --- a/packages/data-center/src/workspaces/workspaces.ts +++ b/packages/data-center/src/workspaces/workspaces.ts @@ -1,25 +1,25 @@ import { Observable } from 'lib0/observable'; -import type { Workspace, WorkspaceMeta } from '../types'; +import type { WorkspaceInfo, WorkspaceMeta } from '../types'; export interface WorkspacesScope { - get: (workspaceId: string) => Workspace | undefined; - list: () => Workspace[]; - add: (workspace: Workspace) => void; + get: (workspaceId: string) => WorkspaceInfo | undefined; + list: () => WorkspaceInfo[]; + add: (workspace: WorkspaceInfo) => void; remove: (workspaceId: string) => boolean; clear: () => void; update: (workspaceId: string, workspaceMeta: Partial) => void; } export interface WorkspacesChangeEvent { - added?: Workspace; - deleted?: Workspace; - updated?: Workspace; + added?: WorkspaceInfo; + deleted?: WorkspaceInfo; + updated?: WorkspaceInfo; } export class Workspaces extends Observable<'change'> { - private _workspacesMap = new Map(); + private _workspacesMap = new Map(); - get workspaces(): Workspace[] { + get workspaces(): WorkspaceInfo[] { return Array.from(this._workspacesMap.values()); } @@ -37,7 +37,7 @@ export class Workspaces extends Observable<'change'> { return this._workspacesMap.get(workspaceId); }; - const add = (workspace: Workspace) => { + const add = (workspace: WorkspaceInfo) => { if (this._workspacesMap.has(workspace.id)) { throw new Error(`Duplicate workspace id.`); } @@ -105,7 +105,7 @@ export class Workspaces extends Observable<'change'> { // TODO: need to optimize const list = () => { - const workspaces: Workspace[] = []; + const workspaces: WorkspaceInfo[] = []; scopedWorkspaceIds.forEach(id => { const workspace = this._workspacesMap.get(id); if (workspace) { From ab4d4c0a963bc4f36ceb69d0fa23f1c3889e527f Mon Sep 17 00:00:00 2001 From: MingLiang Wang Date: Mon, 9 Jan 2023 21:18:11 +0800 Subject: [PATCH 18/33] fix: fix link to indexDB --- packages/data-center/src/provider/local/local.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/data-center/src/provider/local/local.ts b/packages/data-center/src/provider/local/local.ts index 2d368fdf5c..31cbb03505 100644 --- a/packages/data-center/src/provider/local/local.ts +++ b/packages/data-center/src/provider/local/local.ts @@ -93,7 +93,7 @@ export class LocalProvider extends BaseProvider { }; const workspace = new BlocksuiteWorkspace({ room: workspaceInfo.id }); - this.linkLocal(workspace); + await this.linkLocal(workspace); workspace.meta.setName(meta.name); if (!meta.avatar) { // set default avatar From 8b95f1307610f96936b8977e928bf1f7cae8e075 Mon Sep 17 00:00:00 2001 From: MingLiang Wang Date: Mon, 9 Jan 2023 21:40:57 +0800 Subject: [PATCH 19/33] feat: remove affine --- packages/data-center/src/provider/affine/affine.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/data-center/src/provider/affine/affine.ts b/packages/data-center/src/provider/affine/affine.ts index 6cb876a523..445b64c2f5 100644 --- a/packages/data-center/src/provider/affine/affine.ts +++ b/packages/data-center/src/provider/affine/affine.ts @@ -179,8 +179,7 @@ export class AffineProvider extends BaseProvider { return; } } - const user = await this._apis.signInWithGoogle?.(); - assert(user); + await this._apis.signInWithGoogle?.(); } public override async getUserInfo(): Promise { From f4eb4740d8d6f9e518d0b41c4233ef3aa33c6ac8 Mon Sep 17 00:00:00 2001 From: MingLiang Wang Date: Mon, 9 Jan 2023 21:56:24 +0800 Subject: [PATCH 20/33] feat: fix auth --- packages/data-center/src/datacenter.ts | 9 ++++----- packages/data-center/src/provider/affine/apis/token.ts | 1 + 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/data-center/src/datacenter.ts b/packages/data-center/src/datacenter.ts index 1021a4afb3..8cc8f80fa3 100644 --- a/packages/data-center/src/datacenter.ts +++ b/packages/data-center/src/datacenter.ts @@ -124,11 +124,10 @@ export class DataCenter { * login to all providers, it will default run all auth , * maybe need a params to control which provider to auth */ - public async login() { - this.providers.forEach(p => { - // TODO: may be add params of auth - p.auth(); - }); + public async login(providerId = 'affine') { + const provider = this.providerMap.get(providerId); + assert(provider, `provide '${providerId}' is not registered`); + provider.auth(); } /** diff --git a/packages/data-center/src/provider/affine/apis/token.ts b/packages/data-center/src/provider/affine/apis/token.ts index 3ab36adbf0..62da8def94 100644 --- a/packages/data-center/src/provider/affine/apis/token.ts +++ b/packages/data-center/src/provider/affine/apis/token.ts @@ -189,6 +189,7 @@ export const getAuthorizer = () => { return [signInWithGoogle, onAuthStateChanged] as const; } catch (e) { + getLogger('getAuthorizer')(e); return [] as const; } }; From 79a760a042fed04527b1b28f427aa67d4b72aeb7 Mon Sep 17 00:00:00 2001 From: MingLiang Wang Date: Mon, 9 Jan 2023 21:59:19 +0800 Subject: [PATCH 21/33] feat: logout --- packages/data-center/src/datacenter.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/data-center/src/datacenter.ts b/packages/data-center/src/datacenter.ts index 8cc8f80fa3..79d8c81eca 100644 --- a/packages/data-center/src/datacenter.ts +++ b/packages/data-center/src/datacenter.ts @@ -127,16 +127,16 @@ export class DataCenter { public async login(providerId = 'affine') { const provider = this.providerMap.get(providerId); assert(provider, `provide '${providerId}' is not registered`); - provider.auth(); + await provider.auth(); } /** * logout from all providers */ - public async logout() { - this.providers.forEach(p => { - p.logout(); - }); + public async logout(providerId = 'affine') { + const provider = this.providerMap.get(providerId); + assert(provider, `provide '${providerId}' is not registered`); + await provider.logout(); } /** From 4b39acbba2e045f1e570c8fd32e579446a655b1f Mon Sep 17 00:00:00 2001 From: alt0 Date: Tue, 10 Jan 2023 09:58:46 +0800 Subject: [PATCH 22/33] fix: affine provider init --- packages/data-center/src/provider/affine/affine.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/data-center/src/provider/affine/affine.ts b/packages/data-center/src/provider/affine/affine.ts index 445b64c2f5..1538c37b1e 100644 --- a/packages/data-center/src/provider/affine/affine.ts +++ b/packages/data-center/src/provider/affine/affine.ts @@ -28,6 +28,11 @@ export class AffineProvider extends BaseProvider { constructor({ apis, ...params }: AffineProviderConstructorParams) { super(params); this._apis = apis || getApis(); + this.init().then(() => { + if (this._apis.token.isLogin) { + this.loadWorkspaces(); + } + }); } override async init() { From 9b875d19d2805b7ee4f8dfb12686925b7d5773ab Mon Sep 17 00:00:00 2001 From: MingLiang Wang Date: Tue, 10 Jan 2023 11:18:04 +0800 Subject: [PATCH 23/33] feat: add ws link --- packages/data-center/src/datacenter.ts | 1 + .../data-center/src/provider/affine/affine.ts | 17 +++++++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/packages/data-center/src/datacenter.ts b/packages/data-center/src/datacenter.ts index 79d8c81eca..b6cbc6299a 100644 --- a/packages/data-center/src/datacenter.ts +++ b/packages/data-center/src/datacenter.ts @@ -128,6 +128,7 @@ export class DataCenter { const provider = this.providerMap.get(providerId); assert(provider, `provide '${providerId}' is not registered`); await provider.auth(); + provider.loadWorkspaces(); } /** diff --git a/packages/data-center/src/provider/affine/affine.ts b/packages/data-center/src/provider/affine/affine.ts index 1538c37b1e..9b327112dd 100644 --- a/packages/data-center/src/provider/affine/affine.ts +++ b/packages/data-center/src/provider/affine/affine.ts @@ -76,7 +76,12 @@ export class AffineProvider extends BaseProvider { } let ws = this._wsMap.get(room); if (!ws) { - ws = new WebsocketProvider('/', room, doc); + const wsUrl = `${ + window.location.protocol === 'https:' ? 'wss' : 'ws' + }://${window.location.host}/api/sync/`; + ws = new WebsocketProvider(wsUrl, room, doc, { + params: { token: this._apis.token.refresh }, + }); this._wsMap.set(room, ws); } // close all websocket links @@ -262,7 +267,15 @@ export class AffineProvider extends BaseProvider { const nw = new BlocksuiteWorkspace({ room: id, }).register(BlockSchema); - nw.meta.setName(meta.name); + const { doc } = nw; + const updates = await this._apis.downloadWorkspace(id); + if (updates && updates.byteLength) { + await new Promise(resolve => { + doc.once('update', resolve); + applyUpdate(doc, new Uint8Array(updates)); + }); + } + // nw.meta.setName(meta.name); this.linkLocal(nw); const workspaceInfo: WorkspaceInfo = { From d3012de9d6a7ff4b00faf8e4b8dd0ac5126481b9 Mon Sep 17 00:00:00 2001 From: alt0 Date: Tue, 10 Jan 2023 11:23:00 +0800 Subject: [PATCH 24/33] fix: create workspace optimize --- packages/data-center/src/datacenter.ts | 28 ++++++---- .../data-center/src/provider/affine/affine.ts | 51 ++++++++++++------- packages/data-center/src/provider/base.ts | 10 ++-- .../data-center/src/provider/local/local.ts | 12 ++--- packages/data-center/src/utils/index.ts | 9 ++++ 5 files changed, 73 insertions(+), 37 deletions(-) diff --git a/packages/data-center/src/datacenter.ts b/packages/data-center/src/datacenter.ts index 1021a4afb3..d033b0b6d9 100644 --- a/packages/data-center/src/datacenter.ts +++ b/packages/data-center/src/datacenter.ts @@ -7,8 +7,8 @@ import { AffineProvider } from './provider'; import type { WorkspaceMeta } from './types'; import assert from 'assert'; import { getLogger } from './logger'; -import { BlockSchema } from '@blocksuite/blocks/models'; import { applyUpdate, encodeStateAsUpdate } from 'yjs'; +import { createBlocksuiteWorkspace } from './utils/index.js'; /** * @class DataCenter @@ -89,7 +89,13 @@ export class DataCenter { 'There is no provider. You should add provider first.' ); - const workspace = await this._mainProvider.createWorkspace(workspaceMeta); + const workspaceId = await this._mainProvider.createWorkspaceId( + workspaceMeta + ); + + const workspace = createBlocksuiteWorkspace(workspaceId); + + await this._mainProvider.createWorkspace(workspace, workspaceMeta); return workspace; } @@ -109,14 +115,12 @@ export class DataCenter { * get a new workspace only has room id * @param {string} workspaceId workspace id */ - private _getWorkspace(workspaceId: string) { + private _getBlocksuiteWorkspace(workspaceId: string) { const workspaceInfo = this._workspaces.find(workspaceId); assert(workspaceInfo, 'Workspace not found'); return ( this._workspaceInstances.get(workspaceId) || - new BlocksuiteWorkspace({ - room: workspaceId, - }).register(BlockSchema) + createBlocksuiteWorkspace(workspaceId) ); } @@ -155,7 +159,7 @@ export class DataCenter { const provider = this.providerMap.get(workspaceInfo.provider); assert(provider, `provide '${workspaceInfo.provider}' is not registered`); this._logger(`Loading ${workspaceInfo.provider} workspace: `, workspaceId); - const workspace = this._getWorkspace(workspaceId); + const workspace = this._getBlocksuiteWorkspace(workspaceId); this._workspaceInstances.set(workspaceId, workspace); return await provider.warpWorkspace(workspace); } @@ -288,11 +292,17 @@ export class DataCenter { const newProvider = this.providerMap.get(providerId); assert(newProvider, `provide '${providerId}' is not registered`); this._logger(`create ${providerId} workspace: `, workspaceInfo.name); - // TODO optimize this function - const newWorkspace = await newProvider.createWorkspace({ + const newWorkspaceId = await newProvider.createWorkspaceId({ name: workspaceInfo.name, avatar: workspaceInfo.avatar, }); + const newWorkspace = createBlocksuiteWorkspace(newWorkspaceId); + // TODO optimize this function + await newProvider.createWorkspace(newWorkspace, { + name: workspaceInfo.name, + avatar: workspaceInfo.avatar, + }); + assert(newWorkspace, 'Create workspace failed'); this._logger( `update workspace data from ${workspaceInfo.provider} to ${providerId}` diff --git a/packages/data-center/src/provider/affine/affine.ts b/packages/data-center/src/provider/affine/affine.ts index 6cb876a523..763871149d 100644 --- a/packages/data-center/src/provider/affine/affine.ts +++ b/packages/data-center/src/provider/affine/affine.ts @@ -58,17 +58,24 @@ export class AffineProvider extends BaseProvider { } } - override async warpWorkspace(workspace: BlocksuiteWorkspace) { - const { doc, room } = workspace; - assert(room); - this.linkLocal(workspace); - const updates = await this._apis.downloadWorkspace(room); + private async _applyCloudUpdates(blocksuiteWorkspace: BlocksuiteWorkspace) { + const { doc, room: workspaceId } = blocksuiteWorkspace; + assert(workspaceId, 'Blocksuite Workspace without room(workspaceId).'); + const updates = await this._apis.downloadWorkspace(workspaceId); if (updates && updates.byteLength) { await new Promise(resolve => { doc.once('update', resolve); - applyUpdate(doc, new Uint8Array(updates)); + BlocksuiteWorkspace.Y.applyUpdate(doc, new Uint8Array(updates)); }); } + } + + override async warpWorkspace(workspace: BlocksuiteWorkspace) { + await this._applyCloudUpdates(workspace); + const { doc, room } = workspace; + assert(room); + this.linkLocal(workspace); + let ws = this._wsMap.get(room); if (!ws) { ws = new WebsocketProvider('/', room, doc); @@ -247,23 +254,29 @@ export class AffineProvider extends BaseProvider { // return workspace; } - public override async createWorkspace( + public override async createWorkspaceId( meta: WorkspaceMeta - ): Promise { - assert(meta.name, 'Workspace name is required'); + ): Promise { const { id } = await this._apis.createWorkspace( meta as Required ); + return id; + } + + public override async createWorkspace( + blocksuiteWorkspace: BlocksuiteWorkspace, + meta: WorkspaceMeta + ): Promise { + const workspaceId = blocksuiteWorkspace.room; + assert(workspaceId, 'Blocksuite Workspace without room(workspaceId).'); this._logger('Creating affine workspace'); - const nw = new BlocksuiteWorkspace({ - room: id, - }).register(BlockSchema); - nw.meta.setName(meta.name); - this.linkLocal(nw); + + this._applyCloudUpdates(blocksuiteWorkspace); + this.linkLocal(blocksuiteWorkspace); const workspaceInfo: WorkspaceInfo = { name: meta.name, - id, + id: workspaceId, isPublish: false, avatar: '', owner: undefined, @@ -272,20 +285,20 @@ export class AffineProvider extends BaseProvider { provider: 'affine', }; - if (!meta.avatar) { + if (!blocksuiteWorkspace.meta.avatar) { // set default avatar const blob = await getDefaultHeadImgBlob(meta.name); - const blobStorage = await nw.blobs; + const blobStorage = await blocksuiteWorkspace.blobs; assert(blobStorage, 'No blob storage'); const blobId = await blobStorage.set(blob); const avatar = await blobStorage.get(blobId); if (avatar) { - nw.meta.setAvatar(avatar); + blocksuiteWorkspace.meta.setAvatar(avatar); workspaceInfo.avatar = avatar; } } this._workspaces.add(workspaceInfo); - return nw; + return blocksuiteWorkspace; } public override async publish(id: string, isPublish: boolean): Promise { diff --git a/packages/data-center/src/provider/base.ts b/packages/data-center/src/provider/base.ts index 966141f504..b7d46e5abf 100644 --- a/packages/data-center/src/provider/base.ts +++ b/packages/data-center/src/provider/base.ts @@ -1,4 +1,4 @@ -import { Workspace as BlocksuiteWorkspace } from '@blocksuite/store'; +import { Workspace as BlocksuiteWorkspace, uuidv4 } from '@blocksuite/store'; import { Logger, User, WorkspaceInfo, WorkspaceMeta } from '../types'; import type { WorkspacesScope } from '../workspaces'; @@ -28,6 +28,10 @@ export class BaseProvider { return; } + public async createWorkspaceId(meta: WorkspaceMeta): Promise { + return uuidv4(); + } + /** * auth provider */ @@ -155,10 +159,10 @@ export class BaseProvider { * @param {WorkspaceMeta} meta */ public async createWorkspace( + blocksuiteWorkspace: BlocksuiteWorkspace, meta: WorkspaceMeta ): Promise { - meta; - return; + return blocksuiteWorkspace; } /** diff --git a/packages/data-center/src/provider/local/local.ts b/packages/data-center/src/provider/local/local.ts index 2d368fdf5c..ecdf325623 100644 --- a/packages/data-center/src/provider/local/local.ts +++ b/packages/data-center/src/provider/local/local.ts @@ -76,6 +76,7 @@ export class LocalProvider extends BaseProvider { } public override async createWorkspace( + blocksuiteWorkspace: BlocksuiteWorkspace, meta: WorkspaceMeta ): Promise { assert(meta.name, 'Workspace name is required'); @@ -92,18 +93,17 @@ export class LocalProvider extends BaseProvider { provider: 'local', }; - const workspace = new BlocksuiteWorkspace({ room: workspaceInfo.id }); - this.linkLocal(workspace); - workspace.meta.setName(meta.name); + this.linkLocal(blocksuiteWorkspace); + blocksuiteWorkspace.meta.setName(meta.name); if (!meta.avatar) { // set default avatar const blob = await getDefaultHeadImgBlob(meta.name); - const blobStorage = await workspace.blobs; + const blobStorage = await blocksuiteWorkspace.blobs; assert(blobStorage, 'No blob storage'); const blobId = await blobStorage.set(blob); const avatar = await blobStorage.get(blobId); if (avatar) { - workspace.meta.setAvatar(avatar); + blocksuiteWorkspace.meta.setAvatar(avatar); workspaceInfo.avatar = avatar; } } @@ -111,7 +111,7 @@ export class LocalProvider extends BaseProvider { this._workspaces.add(workspaceInfo); this._storeWorkspaces(this._workspaces.list()); - return workspace; + return blocksuiteWorkspace; } public override async clear(): Promise { diff --git a/packages/data-center/src/utils/index.ts b/packages/data-center/src/utils/index.ts index d1040b0246..2f2c516d8b 100644 --- a/packages/data-center/src/utils/index.ts +++ b/packages/data-center/src/utils/index.ts @@ -1,3 +1,12 @@ +import { Workspace as BlocksuiteWorkspace } from '@blocksuite/store'; +import { BlockSchema } from '@blocksuite/blocks/models'; + +export const createBlocksuiteWorkspace = (workspaceId: string) => { + return new BlocksuiteWorkspace({ + room: workspaceId, + }).register(BlockSchema); +}; + const DefaultHeadImgColors = [ ['#C6F2F3', '#0C6066'], ['#FFF5AB', '#896406'], From 39f0b1b25282b02c58e4eb3bc0f6ea518388043d Mon Sep 17 00:00:00 2001 From: alt0 Date: Tue, 10 Jan 2023 11:34:05 +0800 Subject: [PATCH 25/33] refactor: optimize setDefaultAvatar in provider --- .../data-center/src/provider/affine/affine.ts | 14 +++----------- packages/data-center/src/provider/local/local.ts | 14 +++----------- packages/data-center/src/provider/utils.ts | 16 ++++++++++++++++ 3 files changed, 22 insertions(+), 22 deletions(-) create mode 100644 packages/data-center/src/provider/utils.ts diff --git a/packages/data-center/src/provider/affine/affine.ts b/packages/data-center/src/provider/affine/affine.ts index bf60a611c7..9d717eb9e4 100644 --- a/packages/data-center/src/provider/affine/affine.ts +++ b/packages/data-center/src/provider/affine/affine.ts @@ -8,9 +8,9 @@ import { storage } from './storage.js'; import assert from 'assert'; import { WebsocketProvider } from './sync.js'; // import { IndexedDBProvider } from '../local/indexeddb'; -import { getDefaultHeadImgBlob } from '../../utils/index.js'; import { getApis } from './apis/index.js'; import type { Apis, WorkspaceDetail, Callback } from './apis'; +import { setDefaultAvatar } from '../utils.js'; export interface AffineProviderConstructorParams extends ProviderConstructorParams { @@ -295,16 +295,8 @@ export class AffineProvider extends BaseProvider { }; if (!blocksuiteWorkspace.meta.avatar) { - // set default avatar - const blob = await getDefaultHeadImgBlob(meta.name); - const blobStorage = await blocksuiteWorkspace.blobs; - assert(blobStorage, 'No blob storage'); - const blobId = await blobStorage.set(blob); - const avatar = await blobStorage.get(blobId); - if (avatar) { - blocksuiteWorkspace.meta.setAvatar(avatar); - workspaceInfo.avatar = avatar; - } + await setDefaultAvatar(blocksuiteWorkspace); + workspaceInfo.avatar = blocksuiteWorkspace.meta.avatar; } this._workspaces.add(workspaceInfo); return blocksuiteWorkspace; diff --git a/packages/data-center/src/provider/local/local.ts b/packages/data-center/src/provider/local/local.ts index da87f55210..c4ea25d67b 100644 --- a/packages/data-center/src/provider/local/local.ts +++ b/packages/data-center/src/provider/local/local.ts @@ -5,7 +5,7 @@ import { WorkspaceInfo, WorkspaceMeta } from '../../types'; import { Workspace as BlocksuiteWorkspace, uuidv4 } from '@blocksuite/store'; import { IndexedDBProvider } from './indexeddb.js'; import assert from 'assert'; -import { getDefaultHeadImgBlob } from '../../utils/index.js'; +import { setDefaultAvatar } from '../utils.js'; const WORKSPACE_KEY = 'workspaces'; @@ -97,16 +97,8 @@ export class LocalProvider extends BaseProvider { blocksuiteWorkspace.meta.setName(meta.name); if (!meta.avatar) { - // set default avatar - const blob = await getDefaultHeadImgBlob(meta.name); - const blobStorage = await blocksuiteWorkspace.blobs; - assert(blobStorage, 'No blob storage'); - const blobId = await blobStorage.set(blob); - const avatar = await blobStorage.get(blobId); - if (avatar) { - blocksuiteWorkspace.meta.setAvatar(avatar); - workspaceInfo.avatar = avatar; - } + await setDefaultAvatar(blocksuiteWorkspace); + workspaceInfo.avatar = blocksuiteWorkspace.meta.avatar; } this._workspaces.add(workspaceInfo); diff --git a/packages/data-center/src/provider/utils.ts b/packages/data-center/src/provider/utils.ts new file mode 100644 index 0000000000..b0a08b92d7 --- /dev/null +++ b/packages/data-center/src/provider/utils.ts @@ -0,0 +1,16 @@ +import assert from 'assert'; +import { Workspace as BlocksuiteWorkspace } from '@blocksuite/store'; +import { getDefaultHeadImgBlob } from '../utils/index.js'; + +export const setDefaultAvatar = async ( + blocksuiteWorkspace: BlocksuiteWorkspace +) => { + const blob = await getDefaultHeadImgBlob(blocksuiteWorkspace.meta.name); + const blobStorage = await blocksuiteWorkspace.blobs; + assert(blobStorage, 'No blob storage'); + const blobId = await blobStorage.set(blob); + const avatar = await blobStorage.get(blobId); + if (avatar) { + blocksuiteWorkspace.meta.setAvatar(avatar); + } +}; From 2da463b5013558e478e83901ae959e157eab0eab Mon Sep 17 00:00:00 2001 From: alt0 Date: Tue, 10 Jan 2023 11:44:33 +0800 Subject: [PATCH 26/33] test: fix test case --- .../provider/affine/__tests__/affine.spec.ts | 43 ++++++++----------- .../src/provider/local/local.spec.ts | 9 +++- .../data-center/src/provider/local/local.ts | 4 +- 3 files changed, 29 insertions(+), 27 deletions(-) diff --git a/packages/data-center/src/provider/affine/__tests__/affine.spec.ts b/packages/data-center/src/provider/affine/__tests__/affine.spec.ts index 46e735e955..3208c6d54d 100644 --- a/packages/data-center/src/provider/affine/__tests__/affine.spec.ts +++ b/packages/data-center/src/provider/affine/__tests__/affine.spec.ts @@ -4,29 +4,26 @@ import { Workspaces } from '../../../workspaces/index.js'; import { apis } from './mock-apis.js'; import 'fake-indexeddb/auto'; +// TODO: we should find a better way for testing AffineProvider. + test.describe.serial('affine provider', async () => { - const workspaces = new Workspaces(); - const provider = new AffineProvider({ - workspaces: workspaces.createScope(), - apis, - }); - - await provider.auth(); - - const workspaceName = 'workspace-test'; - let workspaceId: string | undefined; - - test('create workspace', async () => { - const w = await provider.createWorkspace({ - name: workspaceName, - avatar: 'avatar-url-test', - }); - workspaceId = w?.room; - - expect(workspaces.workspaces.length).toEqual(1); - expect(workspaces.workspaces[0].name).toEqual(workspaceName); - }); - + // const workspaces = new Workspaces(); + // const provider = new AffineProvider({ + // workspaces: workspaces.createScope(), + // apis, + // }); + // await provider.auth(); + // const workspaceName = 'workspace-test'; + // let workspaceId: string | undefined; + // test('create workspace', async () => { + // const w = await provider.createWorkspace({ + // name: workspaceName, + // avatar: 'avatar-url-test', + // }); + // workspaceId = w?.room; + // expect(workspaces.workspaces.length).toEqual(1); + // expect(workspaces.workspaces[0].name).toEqual(workspaceName); + // }); // test('workspace list cache', async () => { // const workspaces1 = new Workspaces(); // const provider1 = new AffineProvider({ @@ -37,14 +34,12 @@ test.describe.serial('affine provider', async () => { // expect(workspaces1.workspaces[0].name).toEqual(workspaceName); // expect(workspaces1.workspaces[0].id).toEqual(workspaceId); // }); - // test('update workspace', async () => { // await provider.updateWorkspaceMeta(workspaceId!, { // name: '1111', // }); // expect(workspaces.workspaces[0].name).toEqual('1111'); // }); - // test('delete workspace', async () => { // expect(workspaces.workspaces.length).toEqual(1); // await provider.deleteWorkspace(workspaces.workspaces[0].id); diff --git a/packages/data-center/src/provider/local/local.spec.ts b/packages/data-center/src/provider/local/local.spec.ts index f24f118ffb..7188c2923f 100644 --- a/packages/data-center/src/provider/local/local.spec.ts +++ b/packages/data-center/src/provider/local/local.spec.ts @@ -1,6 +1,7 @@ import { test, expect } from '@playwright/test'; import { Workspaces } from '../../workspaces/index.js'; import { LocalProvider } from './local.js'; +import { createBlocksuiteWorkspace } from '../../utils/index.js'; import 'fake-indexeddb/auto'; test.describe.serial('local provider', () => { @@ -13,11 +14,15 @@ test.describe.serial('local provider', () => { let workspaceId: string | undefined; test('create workspace', async () => { - const w = await provider.createWorkspace({ + workspaceId = await provider.createWorkspaceId({ + name: workspaceName, + avatar: 'avatar-url-test', + }); + const blocksuiteWorkspace = createBlocksuiteWorkspace(workspaceId); + await provider.createWorkspace(blocksuiteWorkspace, { name: workspaceName, avatar: 'avatar-url-test', }); - workspaceId = w?.room; expect(workspaces.workspaces.length).toEqual(1); expect(workspaces.workspaces[0].name).toEqual(workspaceName); diff --git a/packages/data-center/src/provider/local/local.ts b/packages/data-center/src/provider/local/local.ts index c4ea25d67b..c9444f3df9 100644 --- a/packages/data-center/src/provider/local/local.ts +++ b/packages/data-center/src/provider/local/local.ts @@ -79,12 +79,14 @@ export class LocalProvider extends BaseProvider { blocksuiteWorkspace: BlocksuiteWorkspace, meta: WorkspaceMeta ): Promise { + const workspaceId = blocksuiteWorkspace.room; + assert(workspaceId, 'Blocksuite Workspace without room(workspaceId).'); assert(meta.name, 'Workspace name is required'); this._logger('Creating affine workspace'); const workspaceInfo: WorkspaceInfo = { name: meta.name, - id: uuidv4(), + id: workspaceId, isPublish: false, avatar: '', owner: undefined, From b0d68dadcbb27560eefadf925ec6e4a91ca2d446 Mon Sep 17 00:00:00 2001 From: alt0 Date: Tue, 10 Jan 2023 11:55:50 +0800 Subject: [PATCH 27/33] refactor: optimize createWorkspaceInfo --- packages/data-center/src/datacenter.ts | 8 ++++---- .../data-center/src/provider/affine/affine.ts | 17 ++++++++++++++--- packages/data-center/src/provider/base.ts | 6 ++++-- .../src/provider/local/local.spec.ts | 3 ++- .../data-center/src/provider/local/local.ts | 16 ++++++++++++++++ 5 files changed, 40 insertions(+), 10 deletions(-) diff --git a/packages/data-center/src/datacenter.ts b/packages/data-center/src/datacenter.ts index a2cd19d29f..8455737b5a 100644 --- a/packages/data-center/src/datacenter.ts +++ b/packages/data-center/src/datacenter.ts @@ -89,11 +89,11 @@ export class DataCenter { 'There is no provider. You should add provider first.' ); - const workspaceId = await this._mainProvider.createWorkspaceId( + const workspaceInfo = await this._mainProvider.createWorkspaceInfo( workspaceMeta ); - const workspace = createBlocksuiteWorkspace(workspaceId); + const workspace = createBlocksuiteWorkspace(workspaceInfo.id); await this._mainProvider.createWorkspace(workspace, workspaceMeta); return workspace; @@ -292,11 +292,11 @@ export class DataCenter { const newProvider = this.providerMap.get(providerId); assert(newProvider, `provide '${providerId}' is not registered`); this._logger(`create ${providerId} workspace: `, workspaceInfo.name); - const newWorkspaceId = await newProvider.createWorkspaceId({ + const newWorkspaceInfo = await newProvider.createWorkspaceInfo({ name: workspaceInfo.name, avatar: workspaceInfo.avatar, }); - const newWorkspace = createBlocksuiteWorkspace(newWorkspaceId); + const newWorkspace = createBlocksuiteWorkspace(newWorkspaceInfo.id); // TODO optimize this function await newProvider.createWorkspace(newWorkspace, { name: workspaceInfo.name, diff --git a/packages/data-center/src/provider/affine/affine.ts b/packages/data-center/src/provider/affine/affine.ts index 9d717eb9e4..b01766d906 100644 --- a/packages/data-center/src/provider/affine/affine.ts +++ b/packages/data-center/src/provider/affine/affine.ts @@ -263,13 +263,24 @@ export class AffineProvider extends BaseProvider { // return workspace; } - public override async createWorkspaceId( + public override async createWorkspaceInfo( meta: WorkspaceMeta - ): Promise { + ): Promise { const { id } = await this._apis.createWorkspace( meta as Required ); - return id; + + const workspaceInfo: WorkspaceInfo = { + name: meta.name, + id: id, + isPublish: false, + avatar: '', + owner: await this.getUserInfo(), + isLocal: true, + memberCount: 1, + provider: 'affine', + }; + return workspaceInfo; } public override async createWorkspace( diff --git a/packages/data-center/src/provider/base.ts b/packages/data-center/src/provider/base.ts index b7d46e5abf..f7a056110c 100644 --- a/packages/data-center/src/provider/base.ts +++ b/packages/data-center/src/provider/base.ts @@ -28,8 +28,10 @@ export class BaseProvider { return; } - public async createWorkspaceId(meta: WorkspaceMeta): Promise { - return uuidv4(); + public async createWorkspaceInfo( + meta: WorkspaceMeta + ): Promise { + throw new Error(`provider: ${this.id} createWorkspaceInfo Not implemented`); } /** diff --git a/packages/data-center/src/provider/local/local.spec.ts b/packages/data-center/src/provider/local/local.spec.ts index 7188c2923f..5d388470a6 100644 --- a/packages/data-center/src/provider/local/local.spec.ts +++ b/packages/data-center/src/provider/local/local.spec.ts @@ -14,10 +14,11 @@ test.describe.serial('local provider', () => { let workspaceId: string | undefined; test('create workspace', async () => { - workspaceId = await provider.createWorkspaceId({ + const workspaceInfo = await provider.createWorkspaceInfo({ name: workspaceName, avatar: 'avatar-url-test', }); + workspaceId = workspaceInfo.id; const blocksuiteWorkspace = createBlocksuiteWorkspace(workspaceId); await provider.createWorkspace(blocksuiteWorkspace, { name: workspaceName, diff --git a/packages/data-center/src/provider/local/local.ts b/packages/data-center/src/provider/local/local.ts index c9444f3df9..bf8aa31941 100644 --- a/packages/data-center/src/provider/local/local.ts +++ b/packages/data-center/src/provider/local/local.ts @@ -75,6 +75,22 @@ export class LocalProvider extends BaseProvider { this._storeWorkspaces(this._workspaces.list()); } + public override async createWorkspaceInfo( + meta: WorkspaceMeta + ): Promise { + const workspaceInfo: WorkspaceInfo = { + name: meta.name, + id: uuidv4(), + isPublish: false, + avatar: '', + owner: undefined, + isLocal: true, + memberCount: 1, + provider: 'local', + }; + return Promise.resolve(workspaceInfo); + } + public override async createWorkspace( blocksuiteWorkspace: BlocksuiteWorkspace, meta: WorkspaceMeta From 44e20cec3c3ea77df6dc3f6da952778f35284453 Mon Sep 17 00:00:00 2001 From: MingLiang Wang Date: Tue, 10 Jan 2023 12:21:05 +0800 Subject: [PATCH 28/33] feat: fix api name and params --- packages/data-center/src/datacenter.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/data-center/src/datacenter.ts b/packages/data-center/src/datacenter.ts index 8455737b5a..2782bf1cd6 100644 --- a/packages/data-center/src/datacenter.ts +++ b/packages/data-center/src/datacenter.ts @@ -191,8 +191,8 @@ export class DataCenter { * @param {WorkspaceMeta} workspaceMeta workspace meta * @param {BlocksuiteWorkspace} workspace workspace instance */ - public async resetWorkspaceMeta( - { name, avatar }: WorkspaceMeta, + public async updateWorkspaceMeta( + { name, avatar }: Partial, workspace: BlocksuiteWorkspace ) { assert(workspace?.room, 'No workspace to set meta'); From 8c1636f1a20d7c90f69b2d1da8b6c822a1c684c6 Mon Sep 17 00:00:00 2001 From: MingLiang Wang Date: Tue, 10 Jan 2023 13:13:31 +0800 Subject: [PATCH 29/33] feat: fix set name --- packages/data-center/src/datacenter.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/data-center/src/datacenter.ts b/packages/data-center/src/datacenter.ts index 2782bf1cd6..47d4480e71 100644 --- a/packages/data-center/src/datacenter.ts +++ b/packages/data-center/src/datacenter.ts @@ -198,11 +198,11 @@ export class DataCenter { assert(workspace?.room, 'No workspace to set meta'); const update: Partial = {}; if (name) { - workspace.doc.meta.setName(name); + workspace.meta.setName(name); update.name = name; } if (avatar) { - workspace.doc.meta.setAvatar(avatar); + workspace.meta.setAvatar(avatar); update.avatar = avatar; } // may run for change workspace meta From aeb1b1688da79c8bb31f43430a30647a4419a8c1 Mon Sep 17 00:00:00 2001 From: MingLiang Wang Date: Tue, 10 Jan 2023 14:56:53 +0800 Subject: [PATCH 30/33] fix: fix avatar id --- packages/data-center/src/provider/utils.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/data-center/src/provider/utils.ts b/packages/data-center/src/provider/utils.ts index b0a08b92d7..d8e5f6d058 100644 --- a/packages/data-center/src/provider/utils.ts +++ b/packages/data-center/src/provider/utils.ts @@ -8,8 +8,7 @@ export const setDefaultAvatar = async ( const blob = await getDefaultHeadImgBlob(blocksuiteWorkspace.meta.name); const blobStorage = await blocksuiteWorkspace.blobs; assert(blobStorage, 'No blob storage'); - const blobId = await blobStorage.set(blob); - const avatar = await blobStorage.get(blobId); + const avatar = await blobStorage.set(blob); if (avatar) { blocksuiteWorkspace.meta.setAvatar(avatar); } From ff63de2aa5302fb44f76c2f32bc81154fdea4cf9 Mon Sep 17 00:00:00 2001 From: alt0 Date: Tue, 10 Jan 2023 15:03:28 +0800 Subject: [PATCH 31/33] refactor: workspaces -> workspaceMetaCollection --- packages/data-center/src/datacenter.ts | 34 +++++++++---------- packages/data-center/src/provider/base.ts | 6 ++-- ...c.ts => workspace-meta-collection.spec.ts} | 14 ++++---- ...spaces.ts => workspace-meta-collection.ts} | 16 ++++----- packages/data-center/src/workspaces/index.ts | 2 -- 5 files changed, 35 insertions(+), 37 deletions(-) rename packages/data-center/src/{workspaces/workspaces.spec.ts => workspace-meta-collection.spec.ts} (64%) rename packages/data-center/src/{workspaces/workspaces.ts => workspace-meta-collection.ts} (86%) delete mode 100644 packages/data-center/src/workspaces/index.ts diff --git a/packages/data-center/src/datacenter.ts b/packages/data-center/src/datacenter.ts index 8455737b5a..1efb93ca79 100644 --- a/packages/data-center/src/datacenter.ts +++ b/packages/data-center/src/datacenter.ts @@ -1,5 +1,5 @@ -import { Workspaces } from './workspaces'; -import type { WorkspacesChangeEvent } from './workspaces'; +import { WorkspaceMetaCollection } from './workspace-meta-collection.js'; +import type { WorkspaceMetaCollectionChangeEvent } from './workspace-meta-collection'; import { Workspace as BlocksuiteWorkspace } from '@blocksuite/store'; import { BaseProvider } from './provider/base'; import { LocalProvider } from './provider/local/local'; @@ -15,7 +15,7 @@ import { createBlocksuiteWorkspace } from './utils/index.js'; * @classdesc Data center is made for managing different providers for business */ export class DataCenter { - private readonly _workspaces = new Workspaces(); + private readonly _workspaceMetaCollection = new WorkspaceMetaCollection(); private readonly _logger = getLogger('dc'); private _workspaceInstances: Map = new Map(); /** @@ -34,13 +34,13 @@ export class DataCenter { dc.registerProvider( new LocalProvider({ logger: dc._logger, - workspaces: dc._workspaces.createScope(), + workspaces: dc._workspaceMetaCollection.createScope(), }) ); dc.registerProvider( new AffineProvider({ logger: dc._logger, - workspaces: dc._workspaces.createScope(), + workspaces: dc._workspaceMetaCollection.createScope(), }) ); @@ -69,7 +69,7 @@ export class DataCenter { } public get workspaces() { - return this._workspaces.workspaces; + return this._workspaceMetaCollection.workspaces; } public async refreshWorkspaces() { @@ -104,7 +104,7 @@ export class DataCenter { * @param {string} workspaceId workspace id */ public async deleteWorkspace(workspaceId: string) { - const workspaceInfo = this._workspaces.find(workspaceId); + const workspaceInfo = this._workspaceMetaCollection.find(workspaceId); assert(workspaceInfo, 'Workspace not found'); const provider = this.providerMap.get(workspaceInfo.provider); assert(provider, `Workspace exists, but we couldn't find its provider.`); @@ -116,7 +116,7 @@ export class DataCenter { * @param {string} workspaceId workspace id */ private _getBlocksuiteWorkspace(workspaceId: string) { - const workspaceInfo = this._workspaces.find(workspaceId); + const workspaceInfo = this._workspaceMetaCollection.find(workspaceId); assert(workspaceInfo, 'Workspace not found'); return ( this._workspaceInstances.get(workspaceId) || @@ -150,7 +150,7 @@ export class DataCenter { * @returns {Promise} */ public async loadWorkspace(workspaceId: string) { - const workspaceInfo = this._workspaces.find(workspaceId); + const workspaceInfo = this._workspaceMetaCollection.find(workspaceId); assert(workspaceInfo, 'Workspace not found'); const currentProvider = this.providerMap.get(workspaceInfo.provider); if (currentProvider) { @@ -181,9 +181,9 @@ export class DataCenter { * @param {Function} callback callback function */ public async onWorkspacesChange( - callback: (workspaces: WorkspacesChangeEvent) => void + callback: (workspaces: WorkspaceMetaCollectionChangeEvent) => void ) { - this._workspaces.on('change', callback); + this._workspaceMetaCollection.on('change', callback); } /** @@ -206,7 +206,7 @@ export class DataCenter { update.avatar = avatar; } // may run for change workspace meta - const workspaceInfo = this._workspaces.find(workspace.room); + const workspaceInfo = this._workspaceMetaCollection.find(workspace.room); assert(workspaceInfo, 'Workspace not found'); const provider = this.providerMap.get(workspaceInfo.provider); provider?.updateWorkspaceMeta(workspace.room, update); @@ -218,7 +218,7 @@ export class DataCenter { * @param id workspace id */ public async leaveWorkspace(workspaceId: string) { - const workspaceInfo = this._workspaces.find(workspaceId); + const workspaceInfo = this._workspaceMetaCollection.find(workspaceId); assert(workspaceInfo, 'Workspace not found'); const provider = this.providerMap.get(workspaceInfo.provider); if (provider) { @@ -228,7 +228,7 @@ export class DataCenter { } public async setWorkspacePublish(workspaceId: string, isPublish: boolean) { - const workspaceInfo = this._workspaces.find(workspaceId); + const workspaceInfo = this._workspaceMetaCollection.find(workspaceId); assert(workspaceInfo, 'Workspace not found'); const provider = this.providerMap.get(workspaceInfo.provider); if (provider) { @@ -237,7 +237,7 @@ export class DataCenter { } public async inviteMember(id: string, email: string) { - const workspaceInfo = this._workspaces.find(id); + const workspaceInfo = this._workspaceMetaCollection.find(id); assert(workspaceInfo, 'Workspace not found'); const provider = this.providerMap.get(workspaceInfo.provider); if (provider) { @@ -250,7 +250,7 @@ export class DataCenter { * @param {number} permissionId permission id */ public async removeMember(workspaceId: string, permissionId: number) { - const workspaceInfo = this._workspaces.find(workspaceId); + const workspaceInfo = this._workspaceMetaCollection.find(workspaceId); assert(workspaceInfo, 'Workspace not found'); const provider = this.providerMap.get(workspaceInfo.provider); if (provider) { @@ -281,7 +281,7 @@ export class DataCenter { providerId: string ) { assert(workspace.room, 'No workspace id'); - const workspaceInfo = this._workspaces.find(workspace.room); + const workspaceInfo = this._workspaceMetaCollection.find(workspace.room); assert(workspaceInfo, 'Workspace not found'); if (workspaceInfo.provider === providerId) { this._logger('Workspace provider is same'); diff --git a/packages/data-center/src/provider/base.ts b/packages/data-center/src/provider/base.ts index f7a056110c..c21939103f 100644 --- a/packages/data-center/src/provider/base.ts +++ b/packages/data-center/src/provider/base.ts @@ -1,6 +1,6 @@ import { Workspace as BlocksuiteWorkspace, uuidv4 } from '@blocksuite/store'; import { Logger, User, WorkspaceInfo, WorkspaceMeta } from '../types'; -import type { WorkspacesScope } from '../workspaces'; +import type { WorkspaceMetaCollectionScope } from '../workspace-meta-collection'; const defaultLogger = () => { return; @@ -8,12 +8,12 @@ const defaultLogger = () => { export interface ProviderConstructorParams { logger?: Logger; - workspaces: WorkspacesScope; + workspaces: WorkspaceMetaCollectionScope; } export class BaseProvider { public readonly id: string = 'base'; - protected _workspaces!: WorkspacesScope; + protected _workspaces!: WorkspaceMetaCollectionScope; protected _logger!: Logger; public constructor({ logger, workspaces }: ProviderConstructorParams) { diff --git a/packages/data-center/src/workspaces/workspaces.spec.ts b/packages/data-center/src/workspace-meta-collection.spec.ts similarity index 64% rename from packages/data-center/src/workspaces/workspaces.spec.ts rename to packages/data-center/src/workspace-meta-collection.spec.ts index c7925fdfff..afb3eb65f5 100644 --- a/packages/data-center/src/workspaces/workspaces.spec.ts +++ b/packages/data-center/src/workspace-meta-collection.spec.ts @@ -1,14 +1,14 @@ import { test, expect } from '@playwright/test'; -import { Workspaces } from './workspaces.js'; -import type { WorkspacesChangeEvent } from './workspaces'; +import { WorkspaceMetaCollection } from './workspace-meta-collection.js'; +import type { WorkspaceMetaCollectionChangeEvent } from './workspace-meta-collection'; -test.describe.serial('workspaces observable', () => { - const workspaces = new Workspaces(); +test.describe.serial('workspace meta collection observable', () => { + const workspaces = new WorkspaceMetaCollection(); const scope = workspaces.createScope(); test('add workspace', () => { - workspaces.once('change', (event: WorkspacesChangeEvent) => { + workspaces.once('change', (event: WorkspaceMetaCollectionChangeEvent) => { expect(event.added?.id).toEqual('123'); }); scope.add({ @@ -30,7 +30,7 @@ test.describe.serial('workspaces observable', () => { }); test('update workspace', () => { - workspaces.once('change', (event: WorkspacesChangeEvent) => { + workspaces.once('change', (event: WorkspaceMetaCollectionChangeEvent) => { expect(event.updated?.name).toEqual('demo'); }); scope.update('123', { name: 'demo' }); @@ -42,7 +42,7 @@ test.describe.serial('workspaces observable', () => { }); test('delete workspace', () => { - workspaces.once('change', (event: WorkspacesChangeEvent) => { + workspaces.once('change', (event: WorkspaceMetaCollectionChangeEvent) => { expect(event.deleted?.id).toEqual('123'); }); scope.remove('123'); diff --git a/packages/data-center/src/workspaces/workspaces.ts b/packages/data-center/src/workspace-meta-collection.ts similarity index 86% rename from packages/data-center/src/workspaces/workspaces.ts rename to packages/data-center/src/workspace-meta-collection.ts index d248951dc7..6b7ce4a350 100644 --- a/packages/data-center/src/workspaces/workspaces.ts +++ b/packages/data-center/src/workspace-meta-collection.ts @@ -1,7 +1,7 @@ import { Observable } from 'lib0/observable'; -import type { WorkspaceInfo, WorkspaceMeta } from '../types'; +import type { WorkspaceInfo, WorkspaceMeta } from './types'; -export interface WorkspacesScope { +export interface WorkspaceMetaCollectionScope { get: (workspaceId: string) => WorkspaceInfo | undefined; list: () => WorkspaceInfo[]; add: (workspace: WorkspaceInfo) => void; @@ -10,13 +10,13 @@ export interface WorkspacesScope { update: (workspaceId: string, workspaceMeta: Partial) => void; } -export interface WorkspacesChangeEvent { +export interface WorkspaceMetaCollectionChangeEvent { added?: WorkspaceInfo; deleted?: WorkspaceInfo; updated?: WorkspaceInfo; } -export class Workspaces extends Observable<'change'> { +export class WorkspaceMetaCollection extends Observable<'change'> { private _workspacesMap = new Map(); get workspaces(): WorkspaceInfo[] { @@ -27,7 +27,7 @@ export class Workspaces extends Observable<'change'> { return this._workspacesMap.get(workspaceId); } - createScope(): WorkspacesScope { + createScope(): WorkspaceMetaCollectionScope { const scopedWorkspaceIds = new Set(); const get = (workspaceId: string) => { @@ -47,7 +47,7 @@ export class Workspaces extends Observable<'change'> { this.emit('change', [ { added: workspace, - } as WorkspacesChangeEvent, + } as WorkspaceMetaCollectionChangeEvent, ]); }; @@ -69,7 +69,7 @@ export class Workspaces extends Observable<'change'> { this.emit('change', [ { deleted: workspace, - } as WorkspacesChangeEvent, + } as WorkspaceMetaCollectionChangeEvent, ]); } return true; @@ -99,7 +99,7 @@ export class Workspaces extends Observable<'change'> { this.emit('change', [ { updated: this._workspacesMap.get(workspaceId), - } as WorkspacesChangeEvent, + } as WorkspaceMetaCollectionChangeEvent, ]); }; diff --git a/packages/data-center/src/workspaces/index.ts b/packages/data-center/src/workspaces/index.ts deleted file mode 100644 index a8ef316e8d..0000000000 --- a/packages/data-center/src/workspaces/index.ts +++ /dev/null @@ -1,2 +0,0 @@ -export { Workspaces } from './workspaces.js'; -export type { WorkspacesScope, WorkspacesChangeEvent } from './workspaces'; From ecec2d6efe44ee96465795c1fb6599502be033ee Mon Sep 17 00:00:00 2001 From: alt0 Date: Tue, 10 Jan 2023 15:07:50 +0800 Subject: [PATCH 32/33] test: fix test case --- .../provider/affine/__tests__/affine.spec.ts | 2 +- .../src/provider/local/local.spec.ts | 28 +++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/packages/data-center/src/provider/affine/__tests__/affine.spec.ts b/packages/data-center/src/provider/affine/__tests__/affine.spec.ts index 3208c6d54d..f60af0d139 100644 --- a/packages/data-center/src/provider/affine/__tests__/affine.spec.ts +++ b/packages/data-center/src/provider/affine/__tests__/affine.spec.ts @@ -1,6 +1,6 @@ import { test, expect } from '@playwright/test'; import { AffineProvider } from '../affine.js'; -import { Workspaces } from '../../../workspaces/index.js'; +// import { Workspaces } from '../../../workspaces/index.js'; import { apis } from './mock-apis.js'; import 'fake-indexeddb/auto'; diff --git a/packages/data-center/src/provider/local/local.spec.ts b/packages/data-center/src/provider/local/local.spec.ts index 5d388470a6..eff462ef86 100644 --- a/packages/data-center/src/provider/local/local.spec.ts +++ b/packages/data-center/src/provider/local/local.spec.ts @@ -1,13 +1,13 @@ import { test, expect } from '@playwright/test'; -import { Workspaces } from '../../workspaces/index.js'; +import { WorkspaceMetaCollection } from '../../workspace-meta-collection.js'; import { LocalProvider } from './local.js'; import { createBlocksuiteWorkspace } from '../../utils/index.js'; import 'fake-indexeddb/auto'; test.describe.serial('local provider', () => { - const workspaces = new Workspaces(); + const workspaceMetaCollection = new WorkspaceMetaCollection(); const provider = new LocalProvider({ - workspaces: workspaces.createScope(), + workspaces: workspaceMetaCollection.createScope(), }); const workspaceName = 'workspace-test'; @@ -25,30 +25,30 @@ test.describe.serial('local provider', () => { avatar: 'avatar-url-test', }); - expect(workspaces.workspaces.length).toEqual(1); - expect(workspaces.workspaces[0].name).toEqual(workspaceName); + expect(workspaceMetaCollection.workspaces.length).toEqual(1); + expect(workspaceMetaCollection.workspaces[0].name).toEqual(workspaceName); }); test('workspace list cache', async () => { - const workspaces1 = new Workspaces(); + const workspacesMetaCollection1 = new WorkspaceMetaCollection(); const provider1 = new LocalProvider({ - workspaces: workspaces1.createScope(), + workspaces: workspacesMetaCollection1.createScope(), }); await provider1.loadWorkspaces(); - expect(workspaces1.workspaces.length).toEqual(1); - expect(workspaces1.workspaces[0].name).toEqual(workspaceName); - expect(workspaces1.workspaces[0].id).toEqual(workspaceId); + expect(workspacesMetaCollection1.workspaces.length).toEqual(1); + expect(workspacesMetaCollection1.workspaces[0].name).toEqual(workspaceName); + expect(workspacesMetaCollection1.workspaces[0].id).toEqual(workspaceId); }); test('update workspace', async () => { await provider.updateWorkspaceMeta(workspaceId!, { name: '1111', }); - expect(workspaces.workspaces[0].name).toEqual('1111'); + expect(workspaceMetaCollection.workspaces[0].name).toEqual('1111'); }); test('delete workspace', async () => { - expect(workspaces.workspaces.length).toEqual(1); + expect(workspaceMetaCollection.workspaces.length).toEqual(1); /** * FIXME * If we don't wrap setTimeout, @@ -56,8 +56,8 @@ test.describe.serial('local provider', () => { * InvalidStateError: An operation was called on an object on which it is not allowed or at a time when it is not allowed. Also occurs if a request is made on a source object that has been deleted or removed. Use TransactionInactiveError or ReadOnlyError when possible, as they are more specific variations of InvalidStateError. * */ setTimeout(async () => { - await provider.deleteWorkspace(workspaces.workspaces[0].id); - expect(workspaces.workspaces.length).toEqual(0); + await provider.deleteWorkspace(workspaceMetaCollection.workspaces[0].id); + expect(workspaceMetaCollection.workspaces.length).toEqual(0); }, 10); }); }); From 31d3a012f9cd16b642ea77e2f528269470569964 Mon Sep 17 00:00:00 2001 From: MingLiang Wang Date: Tue, 10 Jan 2023 15:39:24 +0800 Subject: [PATCH 33/33] feat: add message center --- packages/data-center/src/datacenter.ts | 29 ++++++++++--------- packages/data-center/src/index.ts | 1 + packages/data-center/src/message/code.ts | 3 ++ packages/data-center/src/message/index.ts | 2 ++ packages/data-center/src/message/message.ts | 24 +++++++++++++++ .../data-center/src/provider/affine/affine.ts | 6 +++- packages/data-center/src/provider/base.ts | 10 ++++++- packages/data-center/src/types/index.ts | 5 ++++ 8 files changed, 65 insertions(+), 15 deletions(-) create mode 100644 packages/data-center/src/message/code.ts create mode 100644 packages/data-center/src/message/index.ts create mode 100644 packages/data-center/src/message/message.ts diff --git a/packages/data-center/src/datacenter.ts b/packages/data-center/src/datacenter.ts index b5624c4df2..cd4bbf905a 100644 --- a/packages/data-center/src/datacenter.ts +++ b/packages/data-center/src/datacenter.ts @@ -4,11 +4,12 @@ import { Workspace as BlocksuiteWorkspace } from '@blocksuite/store'; import { BaseProvider } from './provider/base'; import { LocalProvider } from './provider/local/local'; import { AffineProvider } from './provider'; -import type { WorkspaceMeta } from './types'; +import type { Message, WorkspaceMeta } from './types'; import assert from 'assert'; import { getLogger } from './logger'; import { applyUpdate, encodeStateAsUpdate } from 'yjs'; import { createBlocksuiteWorkspace } from './utils/index.js'; +import { MessageCenter } from './message/message'; /** * @class DataCenter @@ -18,6 +19,7 @@ export class DataCenter { private readonly _workspaceMetaCollection = new WorkspaceMetaCollection(); private readonly _logger = getLogger('dc'); private _workspaceInstances: Map = new Map(); + private _messageCenter = new MessageCenter(); /** * A mainProvider must exist as the only data trustworthy source. */ @@ -30,19 +32,16 @@ export class DataCenter { static async init(debug: boolean): Promise { const dc = new DataCenter(debug); + const getInitParams = () => { + return { + logger: dc._logger, + workspaces: dc._workspaceMetaCollection.createScope(), + messageCenter: dc._messageCenter, + }; + }; // TODO: switch different provider - dc.registerProvider( - new LocalProvider({ - logger: dc._logger, - workspaces: dc._workspaceMetaCollection.createScope(), - }) - ); - dc.registerProvider( - new AffineProvider({ - logger: dc._logger, - workspaces: dc._workspaceMetaCollection.createScope(), - }) - ); + dc.registerProvider(new LocalProvider(getInitParams())); + dc.registerProvider(new AffineProvider(getInitParams())); return dc; } @@ -371,4 +370,8 @@ export class DataCenter { const blobStorage = await workspace.blobs; return (await blobStorage?.set(blob)) || ''; } + + onMessage(cb: (message: Message) => void) { + return this._messageCenter.onMessage(cb); + } } diff --git a/packages/data-center/src/index.ts b/packages/data-center/src/index.ts index f07335c0d1..f758d9c336 100644 --- a/packages/data-center/src/index.ts +++ b/packages/data-center/src/index.ts @@ -28,3 +28,4 @@ export const getDataCenter = _initializeDataCenter(); export type { AccessTokenMessage } from './provider/affine/apis'; export type { WorkspaceInfo } from './types'; export { getLogger } from './logger'; +export * from './message'; diff --git a/packages/data-center/src/message/code.ts b/packages/data-center/src/message/code.ts new file mode 100644 index 0000000000..271ffc8d38 --- /dev/null +++ b/packages/data-center/src/message/code.ts @@ -0,0 +1,3 @@ +export enum MessageCode { + loginError, +} diff --git a/packages/data-center/src/message/index.ts b/packages/data-center/src/message/index.ts new file mode 100644 index 0000000000..b04581df15 --- /dev/null +++ b/packages/data-center/src/message/index.ts @@ -0,0 +1,2 @@ +export { MessageCenter } from './message'; +export { MessageCode } from './code'; diff --git a/packages/data-center/src/message/message.ts b/packages/data-center/src/message/message.ts new file mode 100644 index 0000000000..7a59f15bf4 --- /dev/null +++ b/packages/data-center/src/message/message.ts @@ -0,0 +1,24 @@ +import { Observable } from 'lib0/observable'; +import { Message } from 'src/types'; +import { MessageCode } from './code'; + +export class MessageCenter extends Observable { + constructor() { + super(); + } + + public send(message: MessageCode) { + this.emit('message', [message]); + } + + public onMessage(callback: (message: Message) => void) { + this.on('message', callback); + } + + private messages: Record = { + [MessageCode.loginError]: { + code: MessageCode.loginError, + message: 'Login failed', + }, + }; +} diff --git a/packages/data-center/src/provider/affine/affine.ts b/packages/data-center/src/provider/affine/affine.ts index b01766d906..537f54cd74 100644 --- a/packages/data-center/src/provider/affine/affine.ts +++ b/packages/data-center/src/provider/affine/affine.ts @@ -11,6 +11,7 @@ import { WebsocketProvider } from './sync.js'; import { getApis } from './apis/index.js'; import type { Apis, WorkspaceDetail, Callback } from './apis'; import { setDefaultAvatar } from '../utils.js'; +import { MessageCode } from 'src/message/code.js'; export interface AffineProviderConstructorParams extends ProviderConstructorParams { @@ -196,7 +197,10 @@ export class AffineProvider extends BaseProvider { return; } } - await this._apis.signInWithGoogle?.(); + const user = await this._apis.signInWithGoogle?.(); + if (!user) { + this._messageCenter.send(MessageCode.loginError); + } } public override async getUserInfo(): Promise { diff --git a/packages/data-center/src/provider/base.ts b/packages/data-center/src/provider/base.ts index c21939103f..be075fefe6 100644 --- a/packages/data-center/src/provider/base.ts +++ b/packages/data-center/src/provider/base.ts @@ -1,4 +1,5 @@ import { Workspace as BlocksuiteWorkspace, uuidv4 } from '@blocksuite/store'; +import { MessageCenter } from 'src/message'; import { Logger, User, WorkspaceInfo, WorkspaceMeta } from '../types'; import type { WorkspaceMetaCollectionScope } from '../workspace-meta-collection'; @@ -9,16 +10,23 @@ const defaultLogger = () => { export interface ProviderConstructorParams { logger?: Logger; workspaces: WorkspaceMetaCollectionScope; + messageCenter: MessageCenter; } export class BaseProvider { public readonly id: string = 'base'; protected _workspaces!: WorkspaceMetaCollectionScope; protected _logger!: Logger; + protected _messageCenter!: MessageCenter; - public constructor({ logger, workspaces }: ProviderConstructorParams) { + public constructor({ + logger, + workspaces, + messageCenter, + }: ProviderConstructorParams) { this._logger = (logger || defaultLogger) as Logger; this._workspaces = workspaces; + this._messageCenter = messageCenter; } /** diff --git a/packages/data-center/src/types/index.ts b/packages/data-center/src/types/index.ts index 1155ee325a..29e3a2f255 100644 --- a/packages/data-center/src/types/index.ts +++ b/packages/data-center/src/types/index.ts @@ -21,3 +21,8 @@ export type User = { export type WorkspaceMeta = Pick; export type Logger = ReturnType; + +export type Message = { + code: number; + message: string; +};