A fully open source & end-to-end encrypted note taking alternative to Evernote.
TypeScript asp-net-coredotnet-coreelectronfosshacktoberfestnote-managmentnote-takingnote-taking-appnotebooknotesnotes-appopen-sourceopensourceprivacyproductivityreactreact-nativereactjsself-hosted
core: use single listener for receiving pushed items
Abdullah Attac94da3bdf09b
diff --git a/packages/core/src/api/sync/index.ts b/packages/core/src/api/sync/index.tsindex b8c94181b..ad7d7a548 100644--- a/packages/core/src/api/sync/index.ts+++ b/packages/core/src/api/sync/index.ts@@ -190,59 +190,8 @@ class Sync {async fetch(deviceId: string) {await this.checkConnection();- const key = await this.db.user.getEncryptionKey();- if (!key || !key.key || !key.salt) {- this.logger.error(- new Error("User encryption key not generated. Please relogin.")- );- EV.publish(EVENTS.userSessionExpired);- return;- }-- let count = 0;- this.connection?.off("SendItems");- this.connection?.off("SendVaultKey");-- this.connection?.on("SendVaultKey", async (vaultKey) => {- if (this.connection?.state !== signalr.HubConnectionState.Connected)- return false;-- if (- vaultKey &&- vaultKey.cipher !== null &&- vaultKey.iv !== null &&- vaultKey.salt !== null &&- vaultKey.length > 0- ) {- const vault = await this.db.vaults.default();- if (!vault)- await migrateVaultKey(- this.db,- vaultKey,- 5.9,- CURRENT_DATABASE_VERSION- );- }-- return true;- });-- this.connection?.on("SendItems", async (chunk) => {- if (this.connection?.state !== signalr.HubConnectionState.Connected)- return false;-- await this.processChunk(chunk, key);-- count += chunk.items.length;- sendSyncProgressEvent(this.db.eventManager, `download`, count);-- return true;- });await this.connection?.invoke("RequestFetch", deviceId);- this.connection?.off("SendItems");- this.connection?.off("SendVaultKey");-await this.db.sql().updateTable("notes")@@ -414,6 +363,55 @@ class Sync {.build();this.connection.serverTimeoutInMilliseconds = 60 * 1000 * 5;this.connection.on("PushCompleted", () => this.onPushCompleted());+ this.connection.on("SendVaultKey", async (vaultKey) => {+ if (this.connection?.state !== signalr.HubConnectionState.Connected)+ return false;++ if (+ vaultKey &&+ vaultKey.cipher !== null &&+ vaultKey.iv !== null &&+ vaultKey.salt !== null &&+ vaultKey.length > 0+ ) {+ const vault = await this.db.vaults.default();+ if (!vault)+ await migrateVaultKey(+ this.db,+ vaultKey,+ 5.9,+ CURRENT_DATABASE_VERSION+ );+ }++ return true;+ });++ this.connection.on("SendItems", async (chunk) => {+ if (this.connection?.state !== signalr.HubConnectionState.Connected)+ return false;++ const key = await this.getKey();+ if (!key) return false;++ await this.processChunk(chunk, key);++ sendSyncProgressEvent(this.db.eventManager, `download`, chunk.count);++ return true;+ });+ }++ private async getKey() {+ const key = await this.db.user.getEncryptionKey();+ if (!key || !key || !key) {+ this.logger.error(+ new Error("User encryption key not generated. Please relogin.")+ );+ EV.publish(EVENTS.userSessionExpired);+ return;+ }+ return key;}private async checkConnection() {