Merge branch 'develop' into test/collapser

RocketChat · Nov 28, 2024 · 54f7abf · 54f7abf
2 parents f90e853 + bc88ffa
commit 54f7abf
Show file tree

Hide file tree

Showing 73 changed files with 222 additions and 191 deletions.
diff --git a/.changeset/strange-countries-carry.md b/.changeset/strange-countries-carry.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+fixed an issue that caused the conference call ringer to fail to accept calls if the user logged out and in again
diff --git a/apps/meteor/app/ecdh/Session.ts b/apps/meteor/app/ecdh/Session.ts
@@ -1,8 +1,6 @@
 import type { X25519SecretKey, CryptographyKey } from 'sodium-plus';
 import { SodiumPlus, X25519PublicKey } from 'sodium-plus';
 
-let sodium: SodiumPlus;
-
 export class Session {
 	// Encoding for the key exchange, no requirements to be small
 	protected readonly stringFormatKey: BufferEncoding = 'base64';
@@ -21,8 +19,14 @@ export class Session {
 
 	public publicKey: X25519PublicKey;
 
+	private static sodium: SodiumPlus | undefined;
+
 	async sodium(): Promise<SodiumPlus> {
-		return sodium || SodiumPlus.auto();
+		if (!Session.sodium) {
+			Session.sodium = await SodiumPlus.auto();
+		}
+
+		return Session.sodium;
 	}
 
 	get publicKeyString(): string {

diff --git a/apps/meteor/app/lib/server/functions/setUserAvatar.ts b/apps/meteor/app/lib/server/functions/setUserAvatar.ts
@@ -149,7 +149,7 @@ export async function setUserAvatar(
 			}
 
 			return {
-				buffer: dataURI instanceof Buffer ? dataURI : Buffer.from(dataURI, 'binary'),
+				buffer: typeof dataURI === 'string' ? Buffer.from(dataURI, 'binary') : dataURI,
 				type: contentType,
 			};
 		}

diff --git a/apps/meteor/app/livechat/client/externalFrame/crypto.ts b/apps/meteor/app/livechat/client/externalFrame/crypto.ts
@@ -1,4 +1,4 @@
-function ab2str(buf: ArrayBuffer): string {
+function ab2str(buf: ArrayLike<number> | ArrayBuffer): string {
 	return String.fromCharCode(...new Uint16Array(buf));
 }
 

diff --git a/apps/meteor/app/meteor-accounts-saml/server/lib/Utils.ts b/apps/meteor/app/meteor-accounts-saml/server/lib/Utils.ts
@@ -398,7 +398,7 @@ export class SAMLUtils {
 		return mainValue;
 	}
 
-	public static convertArrayBufferToString(buffer: ArrayBuffer, encoding: BufferEncoding = 'utf8'): string {
+	public static convertArrayBufferToString(buffer: Buffer<ArrayBufferLike>, encoding: BufferEncoding = 'utf8'): string {
 		return Buffer.from(buffer).toString(encoding);
 	}
 

diff --git a/apps/meteor/client/lib/VideoConfManager.ts b/apps/meteor/client/lib/VideoConfManager.ts
@@ -472,6 +472,7 @@ export const VideoConfManager = new (class VideoConfManager extends Emitter<Vide
 				clearTimeout(call.acceptTimeout);
 			}
 		});
+		this.userId = undefined;
 		this.incomingDirectCalls.clear();
 		this.dismissedCalls.clear();
 		this.currentCallData = undefined;

diff --git a/apps/meteor/client/views/room/webdav/SaveToWebdavModal.tsx b/apps/meteor/client/views/room/webdav/SaveToWebdavModal.tsx
@@ -57,13 +57,11 @@ const SaveToWebdavModal = ({ onClose, data }: SaveToWebdavModalProps): ReactElem
 		fileRequest.current.onload = async (): Promise<void> => {
 			const arrayBuffer = fileRequest.current?.response;
 			if (arrayBuffer) {
-				const fileData = new Uint8Array(arrayBuffer);
-
 				try {
 					if (!title) {
 						throw new Error('File name is required');
 					}
-					const response = await uploadFileToWebdav(accountId, fileData, title);
+					const response = await uploadFileToWebdav(accountId, arrayBuffer, title);
 					if (!response.success) {
 						throw new Error(response.message ? t(response.message) : 'Error uploading file');
 					}

diff --git a/apps/meteor/ee/server/services/package.json b/apps/meteor/ee/server/services/package.json
@@ -54,12 +54,12 @@
 		"@types/ejson": "^2.2.2",
 		"@types/express": "^4.17.21",
 		"@types/fibers": "^3.1.4",
-		"@types/node": "~20.16.15",
+		"@types/node": "~20.17.8",
 		"@types/ws": "^8.5.13",
 		"npm-run-all": "^4.1.5",
 		"pino-pretty": "^7.6.1",
 		"ts-node": "^10.9.2",
-		"typescript": "~5.6.3"
+		"typescript": "~5.7.2"
 	},
 	"volta": {
 		"extends": "../../../package.json"

diff --git a/apps/meteor/package.json b/apps/meteor/package.json
@@ -128,7 +128,7 @@
 		"@types/meteor-collection-hooks": "^0.8.9",
 		"@types/mkdirp": "^1.0.2",
 		"@types/mocha": "github:whitecolor/mocha-types",
-		"@types/node": "~20.16.15",
+		"@types/node": "~20.17.8",
 		"@types/node-gcm": "^1.0.5",
 		"@types/node-rsa": "^1.1.4",
 		"@types/nodemailer": "^6.4.16",
@@ -214,7 +214,7 @@
 		"supports-color": "~7.2.0",
 		"template-file": "^6.0.1",
 		"ts-node": "^10.9.2",
-		"typescript": "~5.6.3"
+		"typescript": "~5.7.2"
 	},
 	"dependencies": {
 		"@babel/runtime": "~7.26.0",
@@ -433,7 +433,7 @@
 		"tinykeys": "^1.4.0",
 		"twilio": "^3.84.1",
 		"twit": "^2.2.11",
-		"typia": "~6.11.4",
+		"typia": "~6.12.2",
 		"ua-parser-js": "^1.0.39",
 		"underscore": "^1.13.7",
 		"universal-perf-hooks": "^1.0.1",

diff --git a/apps/meteor/server/lib/ldap/Connection.ts b/apps/meteor/server/lib/ldap/Connection.ts
@@ -291,11 +291,11 @@ export class LDAPConnection {
 			return value.map((item) => this.extractLdapAttribute(item));
 		}
 
-		if (value instanceof Buffer) {
-			return value.toString();
+		if (typeof value === 'string') {
+			return value;
 		}
 
-		return value;
+		return value.toString();
 	}
 
 	public extractLdapEntryData(entry: ldapjs.SearchEntry): ILDAPEntry {

diff --git a/apps/uikit-playground/package.json b/apps/uikit-playground/package.json
@@ -51,7 +51,7 @@
     "eslint": "~8.45.0",
     "eslint-plugin-react-hooks": "^5.0.0",
     "eslint-plugin-react-refresh": "^0.4.14",
-    "typescript": "~5.6.3",
+    "typescript": "~5.7.2",
     "vite": "^5.4.11"
   },
   "volta": {

diff --git a/ee/apps/account-service/package.json b/ee/apps/account-service/package.json
@@ -25,7 +25,7 @@
 		"@rocket.chat/string-helpers": "~0.31.25",
 		"@rocket.chat/tools": "workspace:^",
 		"@rocket.chat/tracing": "workspace:^",
-		"@types/node": "~20.16.15",
+		"@types/node": "~20.17.8",
 		"bcrypt": "^5.1.1",
 		"ejson": "^2.2.3",
 		"event-loop-stats": "^1.4.1",
@@ -46,7 +46,7 @@
 		"@types/polka": "^0.5.7",
 		"eslint": "~8.45.0",
 		"ts-node": "^10.9.2",
-		"typescript": "~5.6.3"
+		"typescript": "~5.7.2"
 	},
 	"main": "./dist/ee/apps/account-service/src/service.js",
 	"files": [

diff --git a/ee/apps/authorization-service/package.json b/ee/apps/authorization-service/package.json
@@ -24,7 +24,7 @@
 		"@rocket.chat/rest-typings": "workspace:^",
 		"@rocket.chat/string-helpers": "~0.31.25",
 		"@rocket.chat/tracing": "workspace:^",
-		"@types/node": "~20.16.15",
+		"@types/node": "~20.17.8",
 		"ejson": "^2.2.3",
 		"event-loop-stats": "^1.4.1",
 		"eventemitter3": "^5.0.1",
@@ -42,7 +42,7 @@
 		"@types/polka": "^0.5.7",
 		"eslint": "~8.45.0",
 		"ts-node": "^10.9.2",
-		"typescript": "~5.6.3"
+		"typescript": "~5.7.2"
 	},
 	"main": "./dist/ee/apps/authorization-service/src/service.js",
 	"files": [

diff --git a/ee/apps/ddp-streamer/package.json b/ee/apps/ddp-streamer/package.json
@@ -50,14 +50,14 @@
 		"@types/ejson": "^2.2.2",
 		"@types/gc-stats": "^1.4.3",
 		"@types/meteor": "^2.9.8",
-		"@types/node": "~20.16.15",
+		"@types/node": "~20.17.8",
 		"@types/polka": "^0.5.7",
 		"@types/uuid": "^10.0.0",
 		"@types/ws": "^8.5.13",
 		"eslint": "~8.45.0",
 		"pino-pretty": "^7.6.1",
 		"ts-node": "^10.9.2",
-		"typescript": "~5.6.3"
+		"typescript": "~5.7.2"
 	},
 	"main": "./dist/service.js",
 	"files": [

diff --git a/ee/apps/omnichannel-transcript/package.json b/ee/apps/omnichannel-transcript/package.json
@@ -27,7 +27,7 @@
 		"@rocket.chat/pdf-worker": "workspace:^",
 		"@rocket.chat/tools": "workspace:^",
 		"@rocket.chat/tracing": "workspace:^",
-		"@types/node": "~20.16.15",
+		"@types/node": "~20.17.8",
 		"ejson": "^2.2.3",
 		"emoji-toolkit": "^7.0.1",
 		"event-loop-stats": "^1.4.1",
@@ -48,7 +48,7 @@
 		"@types/polka": "^0.5.7",
 		"eslint": "~8.45.0",
 		"ts-node": "^10.9.2",
-		"typescript": "~5.6.3"
+		"typescript": "~5.7.2"
 	},
 	"main": "./dist/ee/apps/omnichannel-transcript/src/service.js",
 	"files": [

diff --git a/ee/apps/presence-service/package.json b/ee/apps/presence-service/package.json
@@ -24,7 +24,7 @@
 		"@rocket.chat/presence": "workspace:^",
 		"@rocket.chat/string-helpers": "~0.31.25",
 		"@rocket.chat/tracing": "workspace:^",
-		"@types/node": "~20.16.15",
+		"@types/node": "~20.17.8",
 		"ejson": "^2.2.3",
 		"event-loop-stats": "^1.4.1",
 		"eventemitter3": "^5.0.1",
@@ -42,7 +42,7 @@
 		"@types/polka": "^0.5.7",
 		"eslint": "~8.45.0",
 		"ts-node": "^10.9.2",
-		"typescript": "~5.6.3"
+		"typescript": "~5.7.2"
 	},
 	"main": "./dist/ee/apps/presence-service/src/service.js",
 	"files": [

diff --git a/ee/apps/queue-worker/package.json b/ee/apps/queue-worker/package.json
@@ -24,7 +24,7 @@
 		"@rocket.chat/network-broker": "workspace:^",
 		"@rocket.chat/omnichannel-services": "workspace:^",
 		"@rocket.chat/tracing": "workspace:^",
-		"@types/node": "~20.16.15",
+		"@types/node": "~20.17.8",
 		"ejson": "^2.2.3",
 		"emoji-toolkit": "^7.0.1",
 		"event-loop-stats": "^1.4.1",
@@ -45,7 +45,7 @@
 		"@types/polka": "^0.5.7",
 		"eslint": "~8.45.0",
 		"ts-node": "^10.9.2",
-		"typescript": "~5.6.3"
+		"typescript": "~5.7.2"
 	},
 	"main": "./dist/ee/apps/queue-worker/src/service.js",
 	"files": [

diff --git a/ee/apps/stream-hub-service/package.json b/ee/apps/stream-hub-service/package.json
@@ -24,7 +24,7 @@
 		"@rocket.chat/network-broker": "workspace:^",
 		"@rocket.chat/string-helpers": "~0.31.25",
 		"@rocket.chat/tracing": "workspace:^",
-		"@types/node": "~20.16.15",
+		"@types/node": "~20.17.8",
 		"ejson": "^2.2.3",
 		"event-loop-stats": "^1.4.1",
 		"eventemitter3": "^5.0.1",
@@ -44,7 +44,7 @@
 		"@types/polka": "^0.5.7",
 		"eslint": "~8.45.0",
 		"ts-node": "^10.9.2",
-		"typescript": "~5.6.3"
+		"typescript": "~5.7.2"
 	},
 	"main": "./dist/ee/apps/stream-hub-service/src/service.js",
 	"files": [

diff --git a/ee/packages/license/package.json b/ee/packages/license/package.json
@@ -10,7 +10,7 @@
 		"eslint": "~8.45.0",
 		"jest": "~29.7.0",
 		"jest-websocket-mock": "~2.5.0",
-		"typescript": "~5.6.3"
+		"typescript": "~5.7.2"
 	},
 	"scripts": {
 		"build": "tsc",

diff --git a/ee/packages/network-broker/package.json b/ee/packages/network-broker/package.json
@@ -6,13 +6,13 @@
 		"@rocket.chat/eslint-config": "workspace:^",
 		"@types/chai": "~4.3.20",
 		"@types/ejson": "^2.2.2",
-		"@types/node": "~20.16.15",
+		"@types/node": "~20.17.8",
 		"@types/sinon": "^10.0.20",
 		"chai": "^4.5.0",
 		"eslint": "~8.45.0",
 		"jest": "~29.7.0",
 		"sinon": "^19.0.2",
-		"typescript": "~5.6.3"
+		"typescript": "~5.7.2"
 	},
 	"scripts": {
 		"lint": "eslint src",

diff --git a/ee/packages/omnichannel-services/package.json b/ee/packages/omnichannel-services/package.json
@@ -8,7 +8,7 @@
 		"@types/jest": "~29.5.14",
 		"eslint": "~8.45.0",
 		"jest": "~29.7.0",
-		"typescript": "~5.6.3"
+		"typescript": "~5.7.2"
 	},
 	"dependencies": {
 		"@rocket.chat/core-services": "workspace:^",
@@ -21,7 +21,7 @@
 		"@rocket.chat/rest-typings": "workspace:^",
 		"@rocket.chat/string-helpers": "~0.31.25",
 		"@rocket.chat/tools": "workspace:^",
-		"@types/node": "~20.16.15",
+		"@types/node": "~20.17.8",
 		"date-fns": "^2.30.0",
 		"ejson": "^2.2.3",
 		"emoji-toolkit": "^7.0.1",

diff --git a/ee/packages/pdf-worker/package.json b/ee/packages/pdf-worker/package.json
@@ -43,7 +43,7 @@
 		"jest": "~29.7.0",
 		"react-dom": "~18.3.1",
 		"storybook": "^8.4.4",
-		"typescript": "~5.6.3"
+		"typescript": "~5.7.2"
 	},
 	"volta": {
 		"extends": "../../../package.json"

diff --git a/ee/packages/presence/package.json b/ee/packages/presence/package.json
@@ -9,11 +9,11 @@
 		"@rocket.chat/apps-engine": "workspace:^",
 		"@rocket.chat/eslint-config": "workspace:^",
 		"@rocket.chat/rest-typings": "workspace:^",
-		"@types/node": "~20.16.15",
+		"@types/node": "~20.17.8",
 		"babel-jest": "^29.7.0",
 		"eslint": "~8.45.0",
 		"jest": "~29.7.0",
-		"typescript": "~5.6.3"
+		"typescript": "~5.7.2"
 	},
 	"scripts": {
 		"lint": "eslint src",

diff --git a/ee/packages/ui-theming/package.json b/ee/packages/ui-theming/package.json
@@ -16,7 +16,7 @@
 		"eslint-plugin-testing-library": "^6.4.0",
 		"react": "~17.0.2",
 		"react-docgen-typescript-plugin": "~1.0.8",
-		"typescript": "~5.6.3"
+		"typescript": "~5.7.2"
 	},
 	"scripts": {
 		"lint": "eslint --ext .js,.jsx,.ts,.tsx .",

diff --git a/packages/account-utils/package.json b/packages/account-utils/package.json
@@ -4,7 +4,7 @@
 	"private": true,
 	"devDependencies": {
 		"eslint": "~8.45.0",
-		"typescript": "~5.6.3"
+		"typescript": "~5.7.2"
 	},
 	"scripts": {
 		"lint": "eslint --ext .js,.jsx,.ts,.tsx .",

diff --git a/packages/agenda/package.json b/packages/agenda/package.json
@@ -14,7 +14,7 @@
 	"devDependencies": {
 		"@types/debug": "^4.1.12",
 		"eslint": "~8.45.0",
-		"typescript": "~5.6.3"
+		"typescript": "~5.7.2"
 	},
 	"scripts": {
 		"lint": "eslint --ext .js,.jsx,.ts,.tsx .",

diff --git a/packages/api-client/package.json b/packages/api-client/package.json
@@ -8,7 +8,7 @@
 		"eslint": "~8.45.0",
 		"jest": "~29.7.0",
 		"jest-fetch-mock": "^3.0.3",
-		"typescript": "~5.6.3"
+		"typescript": "~5.7.2"
 	},
 	"scripts": {
 		"build": "tsc",

diff --git a/packages/apps-engine/package.json b/packages/apps-engine/package.json
@@ -72,7 +72,7 @@
         "@types/debug": "^4.1.12",
         "@types/lodash.clonedeep": "^4.5.9",
         "@types/nedb": "^1.8.16",
-        "@types/node": "~20.16.15",
+        "@types/node": "~20.17.8",
         "@types/semver": "^7.5.8",
         "@types/stack-trace": "0.0.33",
         "@types/uuid": "~10.0.0",
@@ -88,7 +88,7 @@
         "tap-bark": "^1.0.0",
         "ts-node": "^6.2.0",
         "typedoc": "~0.24.8",
-        "typescript": "~5.6.3",
+        "typescript": "~5.7.2",
         "uglify-es": "^3.3.10"
     },
     "dependencies": {

diff --git a/packages/apps-engine/src/server/AppManager.ts b/packages/apps-engine/src/server/AppManager.ts
@@ -795,7 +795,9 @@ export class AppManager {
                 return this.getCompiler().toSandBox(this, stored, parseResult);
             }
 
-            return appPackageOrInstance;
+            if (appPackageOrInstance instanceof ProxiedApp) {
+                return appPackageOrInstance;
+            }
         })();
 
         await this.purgeAppConfig(app, { keepScheduledJobs: true });