diff --git a/lib/types/store-ops-types.js b/lib/types/store-ops-types.js index 0a1c999a3..46c834d98 100644 --- a/lib/types/store-ops-types.js +++ b/lib/types/store-ops-types.js @@ -1,11 +1,26 @@ // @flow -import type { DraftStoreOperation } from './draft-types.js'; -import type { MessageStoreOperation } from './message-types.js'; -import type { ThreadStoreOperation } from './thread-types.js'; +import type { + DraftStoreOperation, + ClientDBDraftStoreOperation, +} from './draft-types.js'; +import type { + ClientDBMessageStoreOperation, + MessageStoreOperation, +} from './message-types.js'; +import type { + ClientDBThreadStoreOperation, + ThreadStoreOperation, +} from './thread-types.js'; export type StoreOperations = { +draftStoreOperations: $ReadOnlyArray, +threadStoreOperations: $ReadOnlyArray, +messageStoreOperations: $ReadOnlyArray, }; + +export type ClientDBStoreOperations = { + +draftStoreOperations?: $ReadOnlyArray, + +threadStoreOperations?: $ReadOnlyArray, + +messageStoreOperations?: $ReadOnlyArray, +}; diff --git a/web/database/worker/db-worker.js b/web/database/worker/db-worker.js index 60a4964b0..9554832f5 100644 --- a/web/database/worker/db-worker.js +++ b/web/database/worker/db-worker.js @@ -1,107 +1,146 @@ // @flow import localforage from 'localforage'; import initSqlJs, { type SqliteDatabase } from 'sql.js'; +import type { + ClientDBDraftStoreOperation, + DraftStoreOperation, +} from 'lib/types/draft-types.js'; + import { type SharedWorkerMessageEvent, type WorkerRequestMessage, type WorkerResponseMessage, workerRequestMessageTypes, workerResponseMessageTypes, type WorkerRequestProxyMessage, } from '../../types/worker-types.js'; import { getSQLiteDBVersion, setupSQLiteDB } from '../queries/db-queries.js'; +import { + moveDraft, + removeAllDrafts, + updateDraft, +} from '../queries/draft-queries.js'; import { SQLITE_CONTENT, SQLITE_ENCRYPTION_KEY } from '../utils/constants.js'; import { generateDatabaseCryptoKey } from '../utils/worker-crypto-utils.js'; const localforageConfig: PartialConfig = { driver: localforage.INDEXEDDB, name: 'comm', storeName: 'commStorage', description: 'Comm encrypted database storage', version: '1.0', }; localforage.config(localforageConfig); let sqliteDb: ?SqliteDatabase = null; async function initDatabase(sqljsFilePath: string, sqljsFilename: ?string) { const content = await localforage.getItem(SQLITE_CONTENT); const locateFile = defaultFilename => { if (sqljsFilename) { return `${sqljsFilePath}/${sqljsFilename}`; } return `${sqljsFilePath}/${defaultFilename}`; }; const SQL = await initSqlJs({ locateFile, }); if (content) { sqliteDb = new SQL.Database(new Uint8Array(content)); } else { sqliteDb = new SQL.Database(); setupSQLiteDB(sqliteDb); } const dbVersion = getSQLiteDBVersion(sqliteDb); console.info(`Db version: ${dbVersion}`); } +function processDraftStoreOperations( + operations: $ReadOnlyArray, +) { + if (!sqliteDb) { + throw new Error('Database not initialized'); + } + for (const operation: DraftStoreOperation of operations) { + if (operation.type === 'remove_all') { + removeAllDrafts(sqliteDb); + } else if (operation.type === 'update') { + const { key, text } = operation.payload; + updateDraft(sqliteDb, key, text); + } else if (operation.type === 'move') { + const { oldKey, newKey } = operation.payload; + moveDraft(sqliteDb, oldKey, newKey); + } else { + throw new Error('Unsupported draft operation'); + } + } +} + async function processAppRequest( message: WorkerRequestMessage, ): Promise { if (message.type === workerRequestMessageTypes.PING) { return { type: workerResponseMessageTypes.PONG, text: 'PONG', }; } else if (message.type === workerRequestMessageTypes.INIT) { await initDatabase(message.sqljsFilePath, message.sqljsFilename); return; } else if ( message.type === workerRequestMessageTypes.GENERATE_DATABASE_ENCRYPTION_KEY ) { const cryptoKey = await generateDatabaseCryptoKey(); await localforage.setItem(SQLITE_ENCRYPTION_KEY, cryptoKey); return; + } else if ( + message.type === workerRequestMessageTypes.PROCESS_STORE_OPERATIONS + ) { + const { draftStoreOperations } = message.storeOperations; + if (draftStoreOperations) { + processDraftStoreOperations(draftStoreOperations); + } + return; } throw new Error('Request type not supported'); } function connectHandler(event: SharedWorkerMessageEvent) { if (!event.ports.length) { return; } const port: MessagePort = event.ports[0]; console.log('Web database worker alive!'); port.onmessage = async function (messageEvent: MessageEvent) { const data: WorkerRequestProxyMessage = (messageEvent.data: any); const { id, message } = data; if (!id) { port.postMessage({ error: new Error('Request without identifier'), }); } try { const result = await processAppRequest(message); port.postMessage({ id, message: result, }); } catch (e) { port.postMessage({ id, error: e, }); } }; } self.addEventListener('connect', connectHandler); diff --git a/web/types/worker-types.js b/web/types/worker-types.js index 38485f7e1..13a07f444 100644 --- a/web/types/worker-types.js +++ b/web/types/worker-types.js @@ -1,57 +1,66 @@ // @flow +import type { ClientDBStoreOperations } from 'lib/types/store-ops-types.js'; + // The types of messages sent from app to worker export const workerRequestMessageTypes = Object.freeze({ PING: 0, INIT: 1, GENERATE_DATABASE_ENCRYPTION_KEY: 2, + PROCESS_STORE_OPERATIONS: 3, }); export type PingWorkerRequestMessage = { +type: 0, +text: string, }; export type InitWorkerRequestMessage = { +type: 1, +sqljsFilePath: string, +sqljsFilename: ?string, }; export type GenerateDatabaseEncryptionKeyRequestMessage = { +type: 2, }; +export type ProcessStoreOperationsRequestMessage = { + +type: 3, + +storeOperations: ClientDBStoreOperations, +}; + export type WorkerRequestMessage = | PingWorkerRequestMessage | InitWorkerRequestMessage - | GenerateDatabaseEncryptionKeyRequestMessage; + | GenerateDatabaseEncryptionKeyRequestMessage + | ProcessStoreOperationsRequestMessage; export type WorkerRequestProxyMessage = { +id: number, +message: WorkerRequestMessage, }; // The types of messages sent from worker to app export const workerResponseMessageTypes = Object.freeze({ PONG: 0, }); export type PongWorkerResponseMessage = { +type: 0, +text: string, }; export type WorkerResponseMessage = PongWorkerResponseMessage; export type WorkerResponseProxyMessage = { +id?: number, +message?: WorkerResponseMessage, +error?: Error, }; // SharedWorker types export type SharedWorkerMessageEvent = MessageEvent & { +ports: $ReadOnlyArray, ... };