Skip to content

A fully open source & end-to-end encrypted note taking alternative to Evernote.

core: lazy init compressor

Abdullah Attaf0c5f6b949f1
diff --git a/packages/core/__e2e__/sync.test.js b/packages/core/__e2e__/sync.test.js
index 15a783025..b20a515f5 100644
--- a/packages/core/__e2e__/sync.test.js
+++ b/packages/core/__e2e__/sync.test.js
@@ -504,7 +504,7 @@ async function initializeDevice(id, capabilities = []) {
storage: new NodeStorageInterface(),
eventsource: EventSource,
fs: FS,
- compressor: Compressor,
+ compressor: async () => Compressor,
sqliteOptions: {
dialect: (name) =>
new SqliteDialect({
diff --git a/packages/core/__tests__/utils/index.ts b/packages/core/__tests__/utils/index.ts
index fbad5b126..5bb06a53c 100644
--- a/packages/core/__tests__/utils/index.ts
+++ b/packages/core/__tests__/utils/index.ts
@@ -50,7 +50,7 @@ function databaseTest(type: "memory" | "persistent" = "memory") {
storage: new NodeStorageInterface(),
eventsource: EventSource,
fs: FS,
- compressor: Compressor,
+ compressor: async () => Compressor,
sqliteOptions: {
dialect: (name) =>
new SqliteDialect({
diff --git a/packages/core/src/api/index.ts b/packages/core/src/api/index.ts
index bf6775e19..a235bc6d7 100644
--- a/packages/core/src/api/index.ts
+++ b/packages/core/src/api/index.ts
@@ -89,7 +89,7 @@ type Options = {
storage: IStorage;
eventsource?: EventSourceConstructor;
fs: IFileStorage;
- compressor: ICompressor;
+ compressor: () => Promise<ICompressor>;
batchSize: number;
};
@@ -100,6 +100,7 @@ class Database {
eventManager = new EventManager();
sseMutex = new Mutex();
_fs?: FileStorage;
+ _compressor?: Promise<ICompressor>;
storage: StorageAccessor = () => {
if (!this.options?.storage)
@@ -133,7 +134,7 @@ class Database {
throw new Error(
"Database not initialized. Did you forget to call db.setup()?"
);
- return this.options.compressor;
+ return this._compressor || (this._compressor = this.options.compressor());
};
private _sql?: Kysely<DatabaseSchema>;
diff --git a/packages/core/src/collections/session-content.ts b/packages/core/src/collections/session-content.ts
index 692e0290d..9f41de393 100644
--- a/packages/core/src/collections/session-content.ts
+++ b/packages/core/src/collections/session-content.ts
@@ -71,17 +71,16 @@ export class SessionContent implements ICollection {
const session = await this.collection.get(sessionContentId);
if (!session || isDeleted(session)) return;
+ const compressor = await this.db.compressor();
if (
session.contentType === "tiny" &&
session.compressed &&
!session.locked &&
!isCipher(session.data)
) {
- session.data = await this.db
- .compressor()
- .compress(
- tinyToTiptap(await this.db.compressor().decompress(session.data))
- );
+ session.data = await compressor.compress(
+ tinyToTiptap(await compressor.decompress(session.data))
+ );
session.contentType = "tiptap";
await this.collection.upsert(session);
}
@@ -89,7 +88,7 @@ export class SessionContent implements ICollection {
return {
data:
session.compressed && !isCipher(session.data)
- ? await this.db.compressor().decompress(session.data)
+ ? await compressor.decompress(session.data)
: session.data,
type: session.contentType
};
diff --git a/packages/core/src/database/backup.ts b/packages/core/src/database/backup.ts
index d01563988..8aafe796e 100644
--- a/packages/core/src/database/backup.ts
+++ b/packages/core/src/database/backup.ts
@@ -244,7 +244,7 @@ export default class Backup {
buffer = [];
bufferLength = 0;
- itemsJSON = await this.db.compressor().compress(itemsJSON);
+ itemsJSON = await (await this.db.compressor()).compress(itemsJSON);
const hash = SparkMD5.hash(itemsJSON);
@@ -405,7 +405,7 @@ export default class Backup {
state.buffer = [];
state.bufferLength = 0;
- itemsJSON = await this.db.compressor().compress(itemsJSON);
+ itemsJSON = await (await this.db.compressor()).compress(itemsJSON);
const hash = SparkMD5.hash(itemsJSON);
@@ -493,7 +493,9 @@ export default class Backup {
throw new Error("Backup file has been tempered, aborting...");
if ("compressed" in backup && typeof decryptedData === "string")
- decryptedData = await this.db.compressor().decompress(decryptedData);
+ decryptedData = await (
+ await this.db.compressor()
+ ).decompress(decryptedData);
const data =
typeof decryptedData === "string"
diff --git a/packages/core/src/interfaces.ts b/packages/core/src/interfaces.ts
index 23620b8ec..f46dedd28 100644
--- a/packages/core/src/interfaces.ts
+++ b/packages/core/src/interfaces.ts
@@ -117,4 +117,4 @@ export interface IFileStorage {
export type StorageAccessor = () => IStorage;
export type KVStorageAccessor = () => KVStorage;
export type ConfigStorageAccessor = () => ConfigStorage;
-export type CompressorAccessor = () => ICompressor;
+export type CompressorAccessor = () => Promise<ICompressor>;