Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(y-indexeddb): cleanup #2207

Merged
merged 5 commits into from May 4, 2023
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/CLA.md
Expand Up @@ -56,5 +56,5 @@ Example:
- Skye Sun, @skyesun, 2023/04/14
- Jordy Delgado, @Jdelgad8, 2023/04/17
- Howard Do, @howarddo2208, 2023/04/20
- Kevin Deng, @sxzz, 2023/04/21
- 三咲智子 Kevin Deng, @sxzz, 2023/04/21
- Moeyua, @moeyua, 2023/04/22
39 changes: 38 additions & 1 deletion packages/y-indexeddb/src/__tests__/index.spec.ts
Expand Up @@ -13,6 +13,7 @@ import { applyUpdate, Doc, encodeStateAsUpdate } from 'yjs';

import type { WorkspacePersist } from '../index';
import {
CleanupWhenConnectingError,
createIndexedDBProvider,
dbVersion,
DEFAULT_DB_NAME,
Expand Down Expand Up @@ -59,7 +60,7 @@ describe('indexeddb provider', () => {
await provider.whenSynced;
const db = await openDB(rootDBName, dbVersion);
{
const store = await db
const store = db
.transaction('workspace', 'readonly')
.objectStore('workspace');
const data = await store.get(id);
Expand Down Expand Up @@ -161,6 +162,42 @@ describe('indexeddb provider', () => {
expect(p1).not.toBe(p2);
});

test('cleanup', async () => {
const provider = createIndexedDBProvider(workspace.id, workspace.doc);
provider.connect();
await provider.whenSynced;
const db = await openDB(rootDBName, dbVersion);

{
const store = db
.transaction('workspace', 'readonly')
.objectStore('workspace');
const keys = await store.getAllKeys();
expect(keys).contain(workspace.id);
}

await provider.cleanup();

{
const store = db
.transaction('workspace', 'readonly')
.objectStore('workspace');
const keys = await store.getAllKeys();
expect(keys).not.contain(workspace.id);
}
});

test('cleanup when connecting', async () => {
const provider = createIndexedDBProvider(workspace.id, workspace.doc);
provider.connect();
expect(() => provider.cleanup()).rejects.toThrowError(
CleanupWhenConnectingError
);
await provider.whenSynced;
provider.disconnect();
await provider.cleanup();
});

test('merge', async () => {
setMergeCount(5);
const provider = createIndexedDBProvider(
Expand Down
13 changes: 11 additions & 2 deletions packages/y-indexeddb/src/index.ts
Expand Up @@ -90,6 +90,12 @@ export class EarlyDisconnectError extends Error {
}
}

export class CleanupWhenConnectingError extends Error {
constructor() {
super('Cleanup when connecting');
}
}

export const markMilestone = async (
id: string,
doc: Doc,
Expand Down Expand Up @@ -274,8 +280,11 @@ export const createIndexedDBProvider = (
doc.off('update', handleUpdate);
doc.off('destroy', handleDestroy);
},
cleanup() {
// todo
async cleanup() {
if (connect) {
himself65 marked this conversation as resolved.
Show resolved Hide resolved
throw new CleanupWhenConnectingError();
}
(await dbPromise).delete('workspace', id);
himself65 marked this conversation as resolved.
Show resolved Hide resolved
},
whenSynced: Promise.resolve(),
};
Expand Down
2 changes: 1 addition & 1 deletion packages/y-indexeddb/src/shared.ts
Expand Up @@ -11,7 +11,7 @@ export function upgradeDB(db: IDBPDatabase<BlockSuiteBinaryDB>) {
export interface IndexedDBProvider {
connect: () => void;
disconnect: () => void;
cleanup: () => void;
cleanup: () => Promise<void>;
whenSynced: Promise<void>;
}

Expand Down