chore: Meteor 3 / NodeJS 18 upgrade

RELEASE-3.0.md

@@ -0,0 +1,7 @@
+# Instructions to run the meteor development branch of 3.0 version
+
+1. Clone the meteor project locally following the instructions at https://github.com/meteor/meteor/blob/devel/DEVELOPMENT.md
+2. Change to the branch `release-3.0`
+3. Add a alias for the cloned meteor project named `md` (example `alias md=/Users/rocket.chat/Projects/meteor/meteor`). Instructions on link above as well.
+4. Checkout the Rocket.Chat's branch named `meteor-3.0`
+5. Run the project `NODE_OPTIONS="--trace-warnings --unhandled-rejections=warn" DISABLE_FIBERS=1 IGNORE_ASYNC_PLUGIN=1 md`

apps/meteor/.meteor/packages

@@ -15,36 +15,35 @@ rocketchat:streamer
 rocketchat:version
 rocketchat:user-presence
 
-accounts-base@2.2.7
-accounts-facebook@1.3.3
-accounts-github@1.5.0
-accounts-google@1.4.0
-accounts-meteor-developer@1.5.0
-accounts-oauth@1.4.2
-accounts-password@2.3.4
-accounts-twitter@1.5.0
+accounts-base
+accounts-facebook
+accounts-github
+accounts-google
+accounts-meteor-developer
+accounts-oauth
+accounts-password
+accounts-twitter
 
 pauli:accounts-linkedin
-google-oauth@1.4.3
-oauth@2.2.0
-oauth2@1.3.2
+google-oauth
+oauth
+oauth2
 
-check@1.3.2
-ddp-rate-limiter@1.1.1
-rate-limit@1.0.9
-email@2.2.4
-http@2.0.0
+check
+ddp-rate-limiter
+rate-limit
+email
 
-meteor-base@1.5.1
-ddp-common@1.4.0
-webapp@1.13.4
+meteor-base
+ddp-common
+webapp
 
-mongo@1.16.5
+mongo
 
-reload@1.3.1
-service-configuration@1.3.1
-session@1.2.1
-shell-server@0.5.0
+reload
+service-configuration
+session
+shell-server
 
 dispatch:run-as-user
 ostrio:cookies
@@ -53,23 +52,23 @@ kadira:flow-router
 
 meteorhacks:inject-initial
 
-routepolicy@1.1.1
+routepolicy
 
-webapp-hashing@1.1.1
-facts-base@1.0.1
+webapp-hashing
+facts-base
 
-tracker@1.3.1
-reactive-dict@1.3.1
-reactive-var@1.0.12
+tracker
+reactive-dict
+reactive-var
 
-babel-compiler@7.10.3
-standard-minifier-js@2.8.1
-standard-minifier-css@1.9.0
-dynamic-import@0.7.2
-ecmascript@0.16.6
-typescript@4.9.4
+babel-compiler
+standard-minifier-js
+standard-minifier-css
+dynamic-import
+ecmascript
+typescript
 
-autoupdate@1.8.0
+autoupdate
 
 # photoswipe
 

apps/meteor/app/2fa/client/overrideMeteorCall.ts

@@ -39,7 +39,7 @@ const callAsyncWithTotp =
 	(methodName: string, args: unknown[]) =>
 	async (twoFactorCode: string, twoFactorMethod: string): Promise<unknown> => {
 		try {
-			const result = await callAsync(methodName, ...args, { twoFactorCode, twoFactorMethod });
+			const result = await callAsync(methodName, { returnServerPromise: true }, ...args, { twoFactorCode, twoFactorMethod });
 
 			return result;
 		} catch (error: unknown) {
@@ -59,7 +59,7 @@ Meteor.call = function (methodName: string, ...args: unknown[]): unknown {
 };
 
 Meteor.callAsync = async function _callAsyncWithTotp(methodName: string, ...args: unknown[]): Promise<unknown> {
-	const promise = callAsync(methodName, ...args);
+	const promise = callAsync(methodName, { returnServerPromise: true }, ...args);
 
 	return process2faAsyncReturn({
 		promise,

apps/meteor/app/authentication/server/startup/index.js

@@ -228,7 +228,7 @@ const onCreateUserAsync = async function (options, user = {}) {
 
 Accounts.onCreateUser(function (...args) {
 	// Depends on meteor support for Async
-	return Promise.await(onCreateUserAsync.call(this, ...args));
+	return onCreateUserAsync.call(this, ...args);
 });
 
 const { insertUserDoc } = Accounts;
@@ -263,7 +263,7 @@ const insertUserDocAsync = async function (options, user) {
 		};
 	}
 
-	const _id = insertUserDoc.call(Accounts, options, user);
+	const _id = await insertUserDoc.call(Accounts, options, user);
 
 	user = await Users.findOne({
 		_id,
@@ -313,7 +313,7 @@ const insertUserDocAsync = async function (options, user) {
 
 Accounts.insertUserDoc = function (...args) {
 	// Depends on meteor support for Async
-	return Promise.await(insertUserDocAsync.call(this, ...args));
+	return insertUserDocAsync.call(this, ...args);
 };
 
 const validateLoginAttemptAsync = async function (login) {
@@ -385,7 +385,7 @@ const validateLoginAttemptAsync = async function (login) {
 
 Accounts.validateLoginAttempt(function (...args) {
 	// Depends on meteor support for Async
-	return Promise.await(validateLoginAttemptAsync.call(this, ...args));
+	return validateLoginAttemptAsync.call(this, ...args);
 });
 
 Accounts.validateNewUser(function (user) {

apps/meteor/app/cas/server/cas_server.js

@@ -5,7 +5,6 @@ import { Accounts } from 'meteor/accounts-base';
 import { WebApp } from 'meteor/webapp';
 import { RoutePolicy } from 'meteor/routepolicy';
 import _ from 'underscore';
-import fiber from 'fibers';
 import { CredentialTokens, Rooms, Users } from '@rocket.chat/models';
 import { validate } from '@rocket.chat/cas-validate';
 
@@ -99,11 +98,7 @@ const middleware = function (req, res, next) {
 
 // Listen to incoming OAuth http requests
 WebApp.connectHandlers.use(function (req, res, next) {
-	// Need to create a fiber since we're using synchronous http calls and nothing
-	// else is wrapping this in a fiber automatically
-	fiber(function () {
-		middleware(req, res, next);
-	}).run();
+	middleware(req, res, next);
 });
 
 /*

apps/meteor/app/file-upload/server/lib/proxy.ts

@@ -13,92 +13,99 @@ import { isDocker } from '../../../utils/server';
 
 const logger = new Logger('UploadProxy');
 
-WebApp.connectHandlers.stack.unshift({
-	route: '',
-	// eslint-disable-next-line @typescript-eslint/no-misused-promises
-	async handle(req: createServer.IncomingMessage, res: http.ServerResponse, next: NextFunction) {
-		// Quick check to see if request should be catch
-		if (!req.url?.includes(`/${UploadFS.config.storesPath}/`)) {
-			return next();
-		}
-
-		logger.debug({ msg: 'Upload URL:', url: req.url });
-
-		if (req.method !== 'POST') {
-			return next();
-		}
-
-		// Remove store path
-		const parsedUrl = URL.parse(req.url);
-		const path = parsedUrl.pathname?.substr(UploadFS.config.storesPath.length + 1) || '';
-
-		// Get store
-		const regExp = new RegExp('^/([^/?]+)/([^/?]+)$');
-		const match = regExp.exec(path);
-
-		// Request is not valid
-		if (match === null) {
-			res.writeHead(400);
-			res.end();
-			return;
-		}
-
-		// Get store
-		const store = UploadFS.getStore(match[1]);
-		if (!store) {
-			res.writeHead(404);
-			res.end();
-			return;
-		}
-
-		// Get file
-		const fileId = match[2];
-		const file = await store.getCollection().findOne({ _id: fileId });
-		if (!file) {
-			res.writeHead(404);
-			res.end();
-			return;
-		}
-
-		if (!file.instanceId || file.instanceId === InstanceStatus.id()) {
-			logger.debug('Correct instance');
-			return next();
-		}
-
-		// Proxy to other instance
-		const instance = await InstanceStatusModel.findOneById(file.instanceId);
-
-		if (instance == null) {
-			res.writeHead(404);
-			res.end();
-			return;
-		}
-
-		if (instance.extraInformation.host === process.env.INSTANCE_IP && isDocker() === false) {
-			instance.extraInformation.host = 'localhost';
-		}
-
-		logger.debug(`Wrong instance, proxing to ${instance.extraInformation.host}:${instance.extraInformation.port}`);
-
-		const options = {
-			hostname: instance.extraInformation.host,
-			port: instance.extraInformation.port,
-			path: req.originalUrl,
-			method: 'POST',
-		};
-
-		logger.warn(
-			'UFS proxy middleware is deprecated as this upload method is not being used by Web/Mobile Clients. See this: https://docs.rocket.chat/api/rest-api/methods/rooms/upload',
-		);
-		// eslint-disable-next-line @typescript-eslint/naming-convention
-		const proxy = http.request(options, function (proxy_res) {
-			proxy_res.pipe(res, {
-				end: true,
-			});
-		});
-
-		req.pipe(proxy, {
+// @ts-expect-error - l
+const dummyRouter = WebApp.connectHandlers._router;
+
+// Create a dummy route
+dummyRouter.route('*');
+// fetch the newly created "layer"
+const stackedRoute = dummyRouter.stack.pop();
+stackedRoute.handle = async (req: createServer.IncomingMessage, res: http.ServerResponse, next: NextFunction) => {
+	// Quick check to see if request should be catch
+	if (!req.url?.includes(`/${UploadFS.config.storesPath}/`)) {
+		return next();
+	}
+
+	logger.debug({ msg: 'Upload URL:', url: req.url });
+
+	if (req.method !== 'POST') {
+		return next();
+	}
+
+	// Remove store path
+	const parsedUrl = URL.parse(req.url);
+	const path = parsedUrl.pathname?.substr(UploadFS.config.storesPath.length + 1) || '';
+
+	// Get store
+	const regExp = new RegExp('^/([^/?]+)/([^/?]+)$');
+	const match = regExp.exec(path);
+
+	// Request is not valid
+	if (match === null) {
+		res.writeHead(400);
+		res.end();
+		return;
+	}
+
+	// Get store
+	const store = UploadFS.getStore(match[1]);
+	if (!store) {
+		res.writeHead(404);
+		res.end();
+		return;
+	}
+
+	// Get file
+	const fileId = match[2];
+	const file = await store.getCollection().findOne({ _id: fileId });
+	if (!file) {
+		res.writeHead(404);
+		res.end();
+		return;
+	}
+
+	if (!file.instanceId || file.instanceId === InstanceStatus.id()) {
+		logger.debug('Correct instance');
+		return next();
+	}
+
+	// Proxy to other instance
+	const instance = await InstanceStatusModel.findOneById(file.instanceId);
+
+	if (instance == null) {
+		res.writeHead(404);
+		res.end();
+		return;
+	}
+
+	if (instance.extraInformation.host === process.env.INSTANCE_IP && isDocker() === false) {
+		instance.extraInformation.host = 'localhost';
+	}
+
+	logger.debug(`Wrong instance, proxing to ${instance.extraInformation.host}:${instance.extraInformation.port}`);
+
+	const options = {
+		hostname: instance.extraInformation.host,
+		port: instance.extraInformation.port,
+		path: req.originalUrl,
+		method: 'POST',
+	};
+
+	logger.warn(
+		'UFS proxy middleware is deprecated as this upload method is not being used by Web/Mobile Clients. See this: https://docs.rocket.chat/api/rest-api/methods/rooms/upload',
+	);
+	// eslint-disable-next-line @typescript-eslint/naming-convention
+	const proxy = http.request(options, function (proxy_res) {
+		proxy_res.pipe(res, {
 			end: true,
 		});
-	},
-});
+	});
+
+	req.pipe(proxy, {
+		end: true,
+	});
+};
+
+// Move the layer to the top :)
+// @ts-expect-error - l
+WebApp.connectHandlers._router.stack.unshift(stackedRoute);

apps/meteor/app/livechat/server/livechat.ts

@@ -5,7 +5,7 @@ import { WebApp } from 'meteor/webapp';
 import { settings } from '../../settings/server';
 import { addServerUrlToIndex } from '../lib/Assets';
 
-const indexHtmlWithServerURL = addServerUrlToIndex(Assets.getText('livechat/index.html') || '');
+const indexHtmlWithServerURL = addServerUrlToIndex((await Assets.getText('livechat/index.html')) || '');
 
 WebApp.connectHandlers.use('/livechat', (req, res, next) => {
 	if (!req.url) {