diff --git a/web/database/database-module-provider.js b/web/database/database-module-provider.js --- a/web/database/database-module-provider.js +++ b/web/database/database-module-provider.js @@ -1,6 +1,9 @@ // @flow -import { DATABASE_WORKER_PATH, SQLJS_FILE_PATH } from './utils/constants.js'; +import { + DATABASE_WORKER_PATH, + DATABASE_MODULE_FILE_PATH, +} from './utils/constants.js'; import { isDesktopSafari, isSQLiteSupported } from './utils/db-utils.js'; import WorkerConnectionProxy from './utils/WorkerConnectionProxy.js'; import type { AppState } from '../redux/redux-setup.js'; @@ -56,7 +59,7 @@ try { await this.workerProxy.scheduleOnWorker({ type: workerRequestMessageTypes.INIT, - sqljsFilePath: `${origin}${SQLJS_FILE_PATH}`, + databaseModuleFilePath: `${origin}${DATABASE_MODULE_FILE_PATH}`, encryptionKey, commQueryExecutorFilename, }); diff --git a/web/database/utils/constants.js b/web/database/utils/constants.js --- a/web/database/utils/constants.js +++ b/web/database/utils/constants.js @@ -8,7 +8,7 @@ export const CURRENT_USER_ID_KEY = 'current_user_id'; export const DATABASE_WORKER_PATH = '/worker/database'; -export const SQLJS_FILE_PATH = '/compiled/webworkers'; +export const DATABASE_MODULE_FILE_PATH = '/compiled/webworkers'; export const DEFAULT_COMM_QUERY_EXECUTOR_FILENAME = 'comm_query_executor.wasm'; diff --git a/web/database/worker/db-worker.js b/web/database/worker/db-worker.js --- a/web/database/worker/db-worker.js +++ b/web/database/worker/db-worker.js @@ -51,11 +51,14 @@ let persistInProgress: boolean = false; async function initDatabase( - sqljsFilePath: string, + databaseModuleFilePath: string, commQueryExecutorFilename: ?string, encryptionKeyJWK?: ?SubtleCrypto$JsonWebKey, ) { - dbModule = getDatabaseModule(commQueryExecutorFilename, sqljsFilePath); + dbModule = getDatabaseModule( + commQueryExecutorFilename, + databaseModuleFilePath, + ); try { const result = dbModule.CommQueryExecutor.testDBOperation(); @@ -201,7 +204,7 @@ // database operations if (message.type === workerRequestMessageTypes.INIT) { await initDatabase( - message.sqljsFilePath, + message.databaseModuleFilePath, message.commQueryExecutorFilename, message.encryptionKey, ); diff --git a/web/types/worker-types.js b/web/types/worker-types.js --- a/web/types/worker-types.js +++ b/web/types/worker-types.js @@ -34,7 +34,7 @@ export type InitWorkerRequestMessage = { +type: 1, - +sqljsFilePath: string, + +databaseModuleFilePath: string, +commQueryExecutorFilename: ?string, +encryptionKey?: ?SubtleCrypto$JsonWebKey, };