From 54ff768844d4cd627fb3781373b942f078266401 Mon Sep 17 00:00:00 2001 From: Andrey Sobolev Date: Mon, 23 Dec 2024 16:35:42 +0700 Subject: [PATCH] Upgrade Live Kit to latest version (#7524) Signed-off-by: Andrey Sobolev --- common/config/rush/pnpm-lock.yaml | 77 ++++++++++++++++------------- desktop/package.json | 2 +- desktop/src/ui/screenShare.ts | 2 +- dev/prod/src/platform.ts | 1 - plugins/love-resources/package.json | 6 +-- plugins/love-resources/src/utils.ts | 6 ++- server/backup/src/backup.ts | 1 - 7 files changed, 52 insertions(+), 43 deletions(-) diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index dc88015b3e..697190fc01 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -42,11 +42,11 @@ dependencies: specifier: ^5.0.0 version: 5.0.0 '@livekit/krisp-noise-filter': - specifier: ~0.2.1 - version: 0.2.2(livekit-client@2.2.0) + specifier: ~0.2.13 + version: 0.2.13(livekit-client@2.7.5) '@livekit/track-processors': - specifier: ~0.3.1 - version: 0.3.2(livekit-client@2.2.0) + specifier: ~0.3.3 + version: 0.3.3(livekit-client@2.7.5) '@octokit/types': specifier: ^12.0.0 version: 12.6.0 @@ -1710,8 +1710,8 @@ dependencies: specifier: ^1.9.46 version: 1.10.56 livekit-client: - specifier: ^2.0.10 - version: 2.2.0 + specifier: ^2.7.5 + version: 2.7.5 livekit-server-sdk: specifier: ^2.0.10 version: 2.6.0 @@ -4782,18 +4782,16 @@ packages: resolution: {integrity: sha512-GlM2AbzrErd/TmLL3E8hAHmb5Q7VhDJp35vIbyPVA5Rz55LZuRr8pwL3qrwwkVNo05gMX1J44gURKb4MHQZo7w==} dev: false - /@livekit/krisp-noise-filter@0.2.2(livekit-client@2.2.0): - resolution: {integrity: sha512-jGAxvw07+6jF3iU7jEeZ6dnr2c2nSIW3J9zt18KM+dwVsLpLNAfFchlwUStpJEmQoDhw9sQgRSOOKpqHcjj7GQ==} + /@livekit/krisp-noise-filter@0.2.13(livekit-client@2.7.5): + resolution: {integrity: sha512-41+NgOIoKsbcIG60f1Hyj4m3zPHIiq7R8HV4pfCUSgr/hnshDIbV0d53Dy/2xqBnXEPCoIbTvFRb8vBllEmYCQ==} peerDependencies: livekit-client: ^2.0.8 dependencies: - livekit-client: 2.2.0 + livekit-client: 2.7.5 dev: false - /@livekit/protocol@1.16.0: - resolution: {integrity: sha512-xZZTZVh2FmWmUgNS3n+oGNbA4GcS4XOwhg8CWy75jenYxbgQ89ds7ixfMQ+F+oxktcXfJ1qsph086oRTlg8e5Q==} - dependencies: - '@bufbuild/protobuf': 1.10.0 + /@livekit/mutex@1.0.0: + resolution: {integrity: sha512-aiUhoThBNF9UyGTxEURFzJLhhPLIVTnQiEVMjRhPnfHNKLfo2JY9xovHKIus7B78UD5hsP6DlgpmAsjrz4U0Iw==} dev: false /@livekit/protocol@1.19.1: @@ -4802,14 +4800,20 @@ packages: '@bufbuild/protobuf': 1.10.0 dev: false - /@livekit/track-processors@0.3.2(livekit-client@2.2.0): - resolution: {integrity: sha512-4JUCzb7yIKoVsTo8J6FTzLZJHcI6DihfX/pGRDg0SOGaxprcDPrt8jaDBBTsnGBSXHeMxl2ugN+xQjdCWzLKEA==} + /@livekit/protocol@1.29.4: + resolution: {integrity: sha512-dsqxvABHilrMA0BU5m1w8cMWSVeDjV2ZUIUDClNQZju3c30DLMfEYDHU5nmXDfaaHjNIgoRbYR7upJMozG8JJg==} + dependencies: + '@bufbuild/protobuf': 1.10.0 + dev: false + + /@livekit/track-processors@0.3.3(livekit-client@2.7.5): + resolution: {integrity: sha512-C5mBWe34ie0pfhCf9zAD65D26ZytzW/xGrj8Zc1BGh5kLISFDVQlefO78LZWw9K5saTamk60O4fzSCKqWMPMLA==} peerDependencies: livekit-client: ^1.12.0 || ^2.1.0 dependencies: '@mediapipe/holistic': 0.5.1675471629 '@mediapipe/tasks-vision': 0.10.9 - livekit-client: 2.2.0 + livekit-client: 2.7.5 dev: false /@malept/cross-spawn-promise@2.0.0: @@ -8537,7 +8541,7 @@ packages: resolution: {integrity: sha512-x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w==} engines: {node: '>=4'} dependencies: - tslib: 2.6.2 + tslib: 2.7.0 dev: false /astral-regex@2.0.0: @@ -9265,7 +9269,7 @@ packages: resolution: {integrity: sha512-XKxXAC3HVPv7r674zP0VC3RTXz+/JKhfyw94ljvF80yynK6VkTnqE3jMuN8b3dUVmmc43TjyxjW4KTsmB3c86g==} dependencies: debug: 4.4.0 - tslib: 2.6.2 + tslib: 2.7.0 transitivePeerDependencies: - supports-color dev: false @@ -15378,17 +15382,18 @@ packages: resolution: {integrity: sha512-auMesunaJ8yfkHvK4gfg1K0SaKX/6Wn9g2Aac/NwX+l5VdmFZzo/hdPGxEOETj+ryRa4/fiOPjeeKURSAJx1sg==} dev: false - /livekit-client@2.2.0: - resolution: {integrity: sha512-Iuk17l269P7SxvE3Gs3ExwoW3+lrz3BfiXOU7gTf/GqansxPx7Y+rfkLHWSBmvmAXOt+Rld4EFEpk8ARSagfnQ==} + /livekit-client@2.7.5: + resolution: {integrity: sha512-sPhHYwXvG75y1LDC50dDC9k6Z49L2vc/HcMRhzhi7yBca6ofPEebpB0bmPOry4ovrnFA+a8TL1pFR2mko1/clw==} dependencies: - '@livekit/protocol': 1.16.0 + '@livekit/mutex': 1.0.0 + '@livekit/protocol': 1.29.4 events: 3.3.0 loglevel: 1.9.1 sdp-transform: 2.14.2 ts-debounce: 4.0.0 - tslib: 2.6.2 + tslib: 2.7.0 typed-emitter: 2.1.0 - webrtc-adapter: 8.2.3 + webrtc-adapter: 9.0.1 dev: false /livekit-server-sdk@2.6.0: @@ -15642,7 +15647,7 @@ packages: /lower-case@2.0.2: resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==} dependencies: - tslib: 2.6.2 + tslib: 2.7.0 dev: false /lowercase-keys@2.0.0: @@ -16477,7 +16482,7 @@ packages: resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==} dependencies: lower-case: 2.0.2 - tslib: 2.6.2 + tslib: 2.7.0 dev: false /node-abi@3.55.0: @@ -18661,7 +18666,7 @@ packages: resolution: {integrity: sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==} requiresBuild: true dependencies: - tslib: 2.6.2 + tslib: 2.7.0 dev: false optional: true @@ -20609,6 +20614,10 @@ packages: resolution: {integrity: sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==} dev: false + /tslib@2.7.0: + resolution: {integrity: sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==} + dev: false + /tsscmp@1.0.6: resolution: {integrity: sha512-LxhtAkPDTkVCMQjt2h6eBVY28KCjikZqZfMcC15YBeNjkgUpdCfBu5HoiOTDu86v6smE8yOjyEktJ8hlbANHQA==} engines: {node: '>=0.6.x'} @@ -21371,8 +21380,8 @@ packages: - uglify-js dev: false - /webrtc-adapter@8.2.3: - resolution: {integrity: sha512-gnmRz++suzmvxtp3ehQts6s2JtAGPuDPjA1F3a9ckNpG1kYdYuHWYpazoAnL9FS5/B21tKlhkorbdCXat0+4xQ==} + /webrtc-adapter@9.0.1: + resolution: {integrity: sha512-1AQO+d4ElfVSXyzNVTOewgGT/tAomwwztX/6e3totvyyzXPvXIIuUUjAmyZGbKBKbZOXauuJooZm3g6IuFuiNQ==} engines: {node: '>=6.0.0', npm: '>=3.10.0'} dependencies: sdp: 3.2.0 @@ -23937,7 +23946,7 @@ packages: dev: false file:projects/desktop.tgz(bufferutil@4.0.8)(sass@1.71.1)(utf-8-validate@6.0.4): - resolution: {integrity: sha512-A11ToahoSZULhHUbTgjKyyMHDZ68BplLHTrHKKiOkZBooPhGcJZJsOLIMKNjJ5+rT+aQDeiSMFMl+2cfaeuh0A==, tarball: file:projects/desktop.tgz} + resolution: {integrity: sha512-dsC1AXo6G2w4mUGwtojyf7fmfs+/DtOZZ+BtgCQOlkvIJUCe2Ff8JiFgn78jAEz9tArOd553ctBfIxRIR/SiEw==, tarball: file:projects/desktop.tgz} id: file:projects/desktop.tgz name: '@rush-temp/desktop' version: 0.0.0 @@ -23973,7 +23982,7 @@ packages: file-loader: 6.2.0(webpack@5.97.1) fork-ts-checker-webpack-plugin: 9.0.2(typescript@5.3.3)(webpack@5.97.1) html-webpack-plugin: 5.6.0(webpack@5.97.1) - livekit-client: 2.2.0 + livekit-client: 2.7.5 mini-css-extract-plugin: 2.8.0(webpack@5.97.1) node-loader: 2.0.0(webpack@5.97.1) postcss: 8.4.35 @@ -25547,13 +25556,13 @@ packages: dev: false file:projects/love-resources.tgz(@types/node@20.11.19)(esbuild@0.20.1)(postcss-load-config@4.0.2)(postcss@8.4.35)(ts-node@10.9.2): - resolution: {integrity: sha512-dWrQ7MUtar6HnPE52l/G6rANBTPCKOs7mnI23PYyBiiKi2x7Gvs3rpFYiAF3lpTTxK5B5TZ/DThx0/YMylj5Fg==, tarball: file:projects/love-resources.tgz} + resolution: {integrity: sha512-xbjsBbX7ymXpU9Ua0cPKMevznsVwwejZYcFPmRpW+1WY1Kxy0pQcuGr+nV8qYSmqQa1g3RJMHTZLT/3RmohFBQ==, tarball: file:projects/love-resources.tgz} id: file:projects/love-resources.tgz name: '@rush-temp/love-resources' version: 0.0.0 dependencies: - '@livekit/krisp-noise-filter': 0.2.2(livekit-client@2.2.0) - '@livekit/track-processors': 0.3.2(livekit-client@2.2.0) + '@livekit/krisp-noise-filter': 0.2.13(livekit-client@2.7.5) + '@livekit/track-processors': 0.3.3(livekit-client@2.7.5) '@types/jest': 29.5.12 '@typescript-eslint/eslint-plugin': 6.21.0(@typescript-eslint/parser@6.21.0)(eslint@8.56.0)(typescript@5.3.3) '@typescript-eslint/parser': 6.21.0(eslint@8.56.0)(typescript@5.3.3) @@ -25564,7 +25573,7 @@ packages: eslint-plugin-promise: 6.1.1(eslint@8.56.0) eslint-plugin-svelte: 2.35.1(eslint@8.56.0)(svelte@4.2.19)(ts-node@10.9.2) jest: 29.7.0(@types/node@20.11.19)(ts-node@10.9.2) - livekit-client: 2.2.0 + livekit-client: 2.7.5 prettier: 3.2.5 prettier-plugin-svelte: 3.2.2(prettier@3.2.5)(svelte@4.2.19) sass: 1.71.1 diff --git a/desktop/package.json b/desktop/package.json index 0093049c99..468cdd5751 100644 --- a/desktop/package.json +++ b/desktop/package.json @@ -219,7 +219,7 @@ "electron-store": "^8.2.0", "electron-log": "^5.1.7", "electron-updater": "^6.3.4", - "livekit-client": "^2.0.10", + "livekit-client": "^2.7.5", "@hcengineering/server-backup": "^0.6.0", "ws": "^8.18.0" }, diff --git a/desktop/src/ui/screenShare.ts b/desktop/src/ui/screenShare.ts index c7f121b430..4516519906 100644 --- a/desktop/src/ui/screenShare.ts +++ b/desktop/src/ui/screenShare.ts @@ -21,7 +21,7 @@ export function defineScreenShare (): void { throw new DeviceUnsupportedError('getDisplayMedia not supported') } - return await new Promise((resolve, reject) => { + return await new Promise>((resolve, reject) => { let wasSelected = false showPopup( diff --git a/dev/prod/src/platform.ts b/dev/prod/src/platform.ts index ac3a633e15..f4e20c97fa 100644 --- a/dev/prod/src/platform.ts +++ b/dev/prod/src/platform.ts @@ -256,7 +256,6 @@ export async function configurePlatform() { if (err.message.includes('Loading chunk') && i != 4) { continue } - Analytics.handleError(err) location.reload() } } diff --git a/plugins/love-resources/package.json b/plugins/love-resources/package.json index 8182753be7..9539c6cbca 100644 --- a/plugins/love-resources/package.json +++ b/plugins/love-resources/package.json @@ -59,9 +59,9 @@ "@hcengineering/view-resources": "^0.6.0", "@hcengineering/workbench": "^0.6.16", "@hcengineering/workbench-resources": "^0.6.1", - "@livekit/krisp-noise-filter": "~0.2.1", - "@livekit/track-processors": "~0.3.1", - "livekit-client": "^2.0.10", + "@livekit/krisp-noise-filter": "~0.2.13", + "@livekit/track-processors": "~0.3.3", + "livekit-client": "^2.7.5", "svelte": "^4.2.19" } } diff --git a/plugins/love-resources/src/utils.ts b/plugins/love-resources/src/utils.ts index e7a3164e2d..17bbe4c6c6 100644 --- a/plugins/love-resources/src/utils.ts +++ b/plugins/love-resources/src/utils.ts @@ -284,8 +284,10 @@ async function setKrispProcessor (pub: LocalTrackPublication): Promise { await pub.track.setProcessor(krispProcessor) await krispProcessor.setEnabled($myPreferences?.noiseCancellation ?? true) } catch (err: any) { - console.error(err) - Analytics.handleError(err) + if (err?.message !== 'SDK_ALREADY_INITIALIZED') { + console.error(err) + Analytics.handleError(err) + } } } } diff --git a/server/backup/src/backup.ts b/server/backup/src/backup.ts index 845d6b7469..bdd7badcf2 100644 --- a/server/backup/src/backup.ts +++ b/server/backup/src/backup.ts @@ -964,7 +964,6 @@ export async function backup ( break } } catch (err: any) { - console.error(err) ctx.error('failed to load chunks', { error: err }) if (idx !== undefined) { await ctx.with('closeChunk', {}, async () => {