Skip to content

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

core: move to json protocol for signalr

Abdullah Atta287307a1ba02
diff --git a/packages/core/package-lock.json b/packages/core/package-lock.json
index 28edbf6cf..d5b4ff20a 100644
--- a/packages/core/package-lock.json
+++ b/packages/core/package-lock.json
@@ -9,8 +9,7 @@
"version": "7.4.1",
"license": "GPL-3.0-or-later",
"dependencies": {
- "@microsoft/signalr": "^7.0.10",
- "@microsoft/signalr-protocol-msgpack": "^7.0.10",
+ "@microsoft/signalr": "^8.0.0",
"@notesnook/logger": "file:../logger",
"@readme/data-urls": "^3.0.0",
"@streetwriters/showdown": "^3.0.5-alpha",
@@ -494,9 +493,9 @@
}
},
"node_modules/@microsoft/signalr": {
- "version": "7.0.10",
- "resolved": "https://registry.npmjs.org/@microsoft/signalr/-/signalr-7.0.10.tgz",
- "integrity": "sha512-tOEn32i5EatAx4sZbzmLgcBc2VbKQmx+F4rI2/Ioq2MnBaYcFxbDzOoZgISIS4IR9H1ij/sKoU8zQOAFC8GJKg==",
+ "version": "8.0.0",
+ "resolved": "https://registry.npmjs.org/@microsoft/signalr/-/signalr-8.0.0.tgz",
+ "integrity": "sha512-K/wS/VmzRWePCGqGh8MU8OWbS1Zvu7DG7LSJS62fBB8rJUXwwj4axQtqrAAwKGUZHQF6CuteuQR9xMsVpM2JNA==",
"dependencies": {
"abort-controller": "^3.0.0",
"eventsource": "^2.0.2",
@@ -505,23 +504,6 @@
"ws": "^7.4.5"
}
},
- "node_modules/@microsoft/signalr-protocol-msgpack": {
- "version": "7.0.10",
- "resolved": "https://registry.npmjs.org/@microsoft/signalr-protocol-msgpack/-/signalr-protocol-msgpack-7.0.10.tgz",
- "integrity": "sha512-iZacNFQ3+BT3wZjFN2qcuQQJWK0ZlyCek4plWw1QrFqqOMBYEwPY4BCbLcwNZcTiOpTK65es1CCf3Yxb6lwlVQ==",
- "dependencies": {
- "@microsoft/signalr": ">=7.0.10",
- "@msgpack/msgpack": "^2.7.0"
- }
- },
- "node_modules/@msgpack/msgpack": {
- "version": "2.8.0",
- "resolved": "https://registry.npmjs.org/@msgpack/msgpack/-/msgpack-2.8.0.tgz",
- "integrity": "sha512-h9u4u/jiIRKbq25PM+zymTyW6bhTzELvOoUd+AvYriWOAKpLGnIamaET3pnHYoI5iYphAHBI4ayx0MehR+VVPQ==",
- "engines": {
- "node": ">= 10"
- }
- },
"node_modules/@notesnook/crypto": {
"resolved": "../crypto",
"link": true
@@ -3182,9 +3164,9 @@
}
},
"@microsoft/signalr": {
- "version": "7.0.10",
- "resolved": "https://registry.npmjs.org/@microsoft/signalr/-/signalr-7.0.10.tgz",
- "integrity": "sha512-tOEn32i5EatAx4sZbzmLgcBc2VbKQmx+F4rI2/Ioq2MnBaYcFxbDzOoZgISIS4IR9H1ij/sKoU8zQOAFC8GJKg==",
+ "version": "8.0.0",
+ "resolved": "https://registry.npmjs.org/@microsoft/signalr/-/signalr-8.0.0.tgz",
+ "integrity": "sha512-K/wS/VmzRWePCGqGh8MU8OWbS1Zvu7DG7LSJS62fBB8rJUXwwj4axQtqrAAwKGUZHQF6CuteuQR9xMsVpM2JNA==",
"requires": {
"abort-controller": "^3.0.0",
"eventsource": "^2.0.2",
@@ -3193,20 +3175,6 @@
"ws": "^7.4.5"
}
},
- "@microsoft/signalr-protocol-msgpack": {
- "version": "7.0.10",
- "resolved": "https://registry.npmjs.org/@microsoft/signalr-protocol-msgpack/-/signalr-protocol-msgpack-7.0.10.tgz",
- "integrity": "sha512-iZacNFQ3+BT3wZjFN2qcuQQJWK0ZlyCek4plWw1QrFqqOMBYEwPY4BCbLcwNZcTiOpTK65es1CCf3Yxb6lwlVQ==",
- "requires": {
- "@microsoft/signalr": ">=7.0.10",
- "@msgpack/msgpack": "^2.7.0"
- }
- },
- "@msgpack/msgpack": {
- "version": "2.8.0",
- "resolved": "https://registry.npmjs.org/@msgpack/msgpack/-/msgpack-2.8.0.tgz",
- "integrity": "sha512-h9u4u/jiIRKbq25PM+zymTyW6bhTzELvOoUd+AvYriWOAKpLGnIamaET3pnHYoI5iYphAHBI4ayx0MehR+VVPQ=="
- },
"@notesnook/crypto": {
"version": "file:../crypto",
"requires": {
diff --git a/packages/core/package.json b/packages/core/package.json
index f1cc96241..b620a350c 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -38,8 +38,7 @@
"test": "vitest run"
},
"dependencies": {
- "@microsoft/signalr": "^7.0.10",
- "@microsoft/signalr-protocol-msgpack": "^7.0.10",
+ "@microsoft/signalr": "^8.0.0",
"@notesnook/logger": "file:../logger",
"@readme/data-urls": "^3.0.0",
"@streetwriters/showdown": "^3.0.5-alpha",
diff --git a/packages/core/src/api/sync/index.js b/packages/core/src/api/sync/index.js
index 58fbeca50..c94dd5be1 100644
--- a/packages/core/src/api/sync/index.js
+++ b/packages/core/src/api/sync/index.js
@@ -31,7 +31,6 @@ import * as signalr from "@microsoft/signalr";
import Merger from "./merger";
import Conflicts from "./conflicts";
import { AutoSync } from "./auto-sync";
-import { MessagePackHubProtocol } from "@microsoft/signalr-protocol-msgpack";
import { logger } from "../../logger";
import { Mutex } from "async-mutex";
import { migrateItem } from "../../migrations";
@@ -144,7 +143,7 @@ class Sync {
}
}
})
- .withHubProtocol(new MessagePackHubProtocol({ ignoreUndefined: true }))
+ .withHubProtocol(new signalr.JsonHubProtocol())
.build();
this.connection.serverTimeoutInMilliseconds = 60 * 1000 * 5;
EV.subscribe(EVENTS.userLoggedOut, async () => {