feat: apps to service

apps/meteor/app/apps/server/api/index.ts

@@ -0,0 +1,21 @@
+import express from 'express';
+import { WebApp } from 'meteor/webapp';
+import { AppsApiService } from '@rocket.chat/core-services';
+
+import { authenticationMiddleware } from '../../../api/server/middlewares/authentication';
+
+const apiServer = express();
+
+apiServer.disable('x-powered-by');
+
+WebApp.connectHandlers.use(apiServer);
+
+class AppsApiRoutes {
+	constructor() {
+		const rejectUnauthorized = false;
+		apiServer.use('/api/apps/private/:appId/:hash', authenticationMiddleware({ rejectUnauthorized }), AppsApiService.handlePrivateRequest);
+		apiServer.use('/api/apps/public/:appId', authenticationMiddleware({ rejectUnauthorized }), AppsApiService.handlePublicRequest);
+	}
+}
+
+export const AppsApiRoutesInstance = new AppsApiRoutes();

apps/meteor/app/apps/server/bridges/activation.ts

@@ -4,6 +4,7 @@ import type { AppStatus } from '@rocket.chat/apps-engine/definition/AppStatus';
 import { Users } from '@rocket.chat/models';
 
 import type { AppServerOrchestrator } from '../../../../ee/server/apps/orchestrator';
+import { AppEvents } from '../../../../ee/server/apps/communication';
 
 export class AppActivationBridge extends ActivationBridge {
 	// eslint-disable-next-line no-empty-function
@@ -12,26 +13,26 @@ export class AppActivationBridge extends ActivationBridge {
 	}
 
 	protected async appAdded(app: ProxiedApp): Promise<void> {
-		await this.orch.getNotifier().appAdded(app.getID());
+		this.orch.notifyAppEvent(AppEvents.APP_ADDED, app.getID());
 	}
 
 	protected async appUpdated(app: ProxiedApp): Promise<void> {
-		await this.orch.getNotifier().appUpdated(app.getID());
+		this.orch.notifyAppEvent(AppEvents.APP_UPDATED, app.getID());
 	}
 
 	protected async appRemoved(app: ProxiedApp): Promise<void> {
-		await this.orch.getNotifier().appRemoved(app.getID());
+		this.orch.notifyAppEvent(AppEvents.APP_REMOVED, app.getID());
 	}
 
 	protected async appStatusChanged(app: ProxiedApp, status: AppStatus): Promise<void> {
 		const userStatus = ['auto_enabled', 'manually_enabled'].includes(status) ? 'online' : 'offline';
 
 		await Users.updateStatusByAppId(app.getID(), userStatus);
 
-		await this.orch.getNotifier().appStatusUpdated(app.getID(), status);
+		this.orch.notifyAppEvent(AppEvents.APP_STATUS_CHANGE, app.getID(), status);
 	}
 
 	protected async actionsChanged(): Promise<void> {
-		await this.orch.getNotifier().actionsChanged();
+		this.orch.notifyAppEvent(AppEvents.APP_STATUS_CHANGE);
 	}
 }

apps/meteor/app/apps/server/bridges/api.ts

@@ -1,94 +1,27 @@
-import { Meteor } from 'meteor/meteor';
-import type { Response, Request, IRouter, RequestHandler } from 'express';
-import express from 'express';
-import { WebApp } from 'meteor/webapp';
-import { ApiBridge } from '@rocket.chat/apps-engine/server/bridges/ApiBridge';
-import type { IApiRequest, IApiEndpoint, IApi } from '@rocket.chat/apps-engine/definition/api';
+import type { IApi, IApiEndpoint } from '@rocket.chat/apps-engine/definition/api';
+import { ApiBridge } from '@rocket.chat/apps-engine/server/bridges';
 import type { AppApi } from '@rocket.chat/apps-engine/server/managers/AppApi';
-import type { RequestMethod } from '@rocket.chat/apps-engine/definition/accessors';
+import { AppsApiService } from '@rocket.chat/core-services';
 
 import type { AppServerOrchestrator } from '../../../../ee/server/apps/orchestrator';
-import { authenticationMiddleware } from '../../../api/server/middlewares/authentication';
-
-const apiServer = express();
-
-apiServer.disable('x-powered-by');
-
-WebApp.connectHandlers.use(apiServer);
-
-interface IRequestWithPrivateHash extends Request {
-	_privateHash?: string;
-	content?: any;
-}
 
 export class AppApisBridge extends ApiBridge {
-	appRouters: Map<string, IRouter>;
-
-	// eslint-disable-next-line no-empty-function
 	constructor(private readonly orch: AppServerOrchestrator) {
 		super();
-		this.appRouters = new Map();
-
-		apiServer.use('/api/apps/private/:appId/:hash', (req: IRequestWithPrivateHash, res: Response) => {
-			const notFound = (): Response => res.sendStatus(404);
-
-			const router = this.appRouters.get(req.params.appId);
-
-			if (router) {
-				req._privateHash = req.params.hash;
-				return router(req, res, notFound);
-			}
-
-			notFound();
-		});
-
-		apiServer.use('/api/apps/public/:appId', (req: Request, res: Response) => {
-			const notFound = (): Response => res.sendStatus(404);
-
-			const router = this.appRouters.get(req.params.appId);
-
-			if (router) {
-				return router(req, res, notFound);
-			}
-
-			notFound();
-		});
 	}
 
-	public async registerApi({ api, computedPath, endpoint }: AppApi, appId: string): Promise<void> {
+	protected async registerApi({ api, computedPath, endpoint }: AppApi, appId: string): Promise<void> {
 		this.orch.debugLog(`The App ${appId} is registering the api: "${endpoint.path}" (${computedPath})`);
 
 		this._verifyApi(api, endpoint);
 
-		let router = this.appRouters.get(appId);
-
-		if (!router) {
-			router = express.Router(); // eslint-disable-line new-cap
-			this.appRouters.set(appId, router);
-		}
-
-		const method = 'all';
-
-		let routePath = endpoint.path.trim();
-		if (!routePath.startsWith('/')) {
-			routePath = `/${routePath}`;
-		}
-
-		if (router[method] instanceof Function) {
-			router[method](
-				routePath,
-				authenticationMiddleware({ rejectUnauthorized: !!endpoint.authRequired }),
-				Meteor.bindEnvironment(this._appApiExecutor(endpoint, appId)),
-			);
-		}
+		await AppsApiService.registerApi(endpoint, appId);
 	}
 
-	public async unregisterApis(appId: string): Promise<void> {
+	protected async unregisterApis(appId: string): Promise<void> {
 		this.orch.debugLog(`The App ${appId} is unregistering all apis`);
 
-		if (this.appRouters.get(appId)) {
-			this.appRouters.delete(appId);
-		}
+		await AppsApiService.unregisterApi(appId);
 	}
 
 	private _verifyApi(api: IApi, endpoint: IApiEndpoint): void {
@@ -100,32 +33,4 @@ export class AppApisBridge extends ApiBridge {
 			throw new Error('Invalid Api parameter provided, it must be a valid IApi object.');
 		}
 	}
-
-	private _appApiExecutor(endpoint: IApiEndpoint, appId: string): RequestHandler {
-		return (req: IRequestWithPrivateHash, res: Response): void => {
-			const request: IApiRequest = {
-				method: req.method.toLowerCase() as RequestMethod,
-				headers: req.headers as { [key: string]: string },
-				query: (req.query as { [key: string]: string }) || {},
-				params: req.params || {},
-				content: req.body,
-				privateHash: req._privateHash,
-				user: req.user && this.orch.getConverters()?.get('users')?.convertToApp(req.user),
-			};
-
-			this.orch
-				.getManager()
-				?.getApiManager()
-				.executeApi(appId, endpoint.path, request)
-				.then(({ status, headers = {}, content }) => {
-					res.set(headers);
-					res.status(status);
-					res.send(content);
-				})
-				.catch((reason) => {
-					// Should we handle this as an error?
-					res.status(500).send(reason.message);
-				});
-		};
-	}
 }

apps/meteor/app/apps/server/bridges/cloud.ts

@@ -1,8 +1,8 @@
 import { CloudWorkspaceBridge } from '@rocket.chat/apps-engine/server/bridges/CloudWorkspaceBridge';
 import type { IWorkspaceToken } from '@rocket.chat/apps-engine/definition/cloud/IWorkspaceToken';
 
-import { getWorkspaceAccessTokenWithScope } from '../../../cloud/server';
 import type { AppServerOrchestrator } from '../../../../ee/server/apps/orchestrator';
+import { getWorkspaceAccessTokenWithScope } from '../../../cloud/server';
 
 export class AppCloudBridge extends CloudWorkspaceBridge {
 	// eslint-disable-next-line no-empty-function