feat(apps): Migrate app management code from @rocket.chat/apps-engine to @rocket.chat/apps internal package

.changeset/beige-parrots-lead.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': minor
+---
+
+Swap usage of internal @rocket.chat/apps-engine internal APIs to @rocket.chat/apps package

.changeset/brown-files-work.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/apps-engine': minor
+---
+
+Remove files that weren't accessible to apps at development time

.changeset/stale-needles-care.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/apps': minor
+---
+
+Receives the migration of internal files from @rocket.chat/apps-engine

.github/actions/build-docker/action.yml

@@ -99,7 +99,7 @@ runs:
 
           find /tmp/build/bundle/programs/server/npm/node_modules/@esbuild -type d -name 'linux-*' -not -name "*-${swc_arch}" -exec rm -rf {} +
 
-          find /tmp/build/bundle/programs/server/npm/node_modules/@rocket.chat/apps-engine/node_modules/@esbuild -type d -name 'linux-*' -not -name "*-${swc_arch}" -exec rm -rf {} +
+          find /tmp/build/bundle/programs/server/npm/node_modules/@rocket.chat/apps/node_modules/@esbuild -type d -name 'linux-*' -not -name "*-${swc_arch}" -exec rm -rf {} +
         fi
 
         if [[ "$INPUT_PUBLISH_IMAGE" == 'true' ]]; then

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

@@ -1,11 +1,10 @@
 import type { IAppServerOrchestrator, AppStatus } from '@rocket.chat/apps';
-import type { ProxiedApp } from '@rocket.chat/apps-engine/server/ProxiedApp';
-import { AppActivationBridge as ActivationBridge } from '@rocket.chat/apps-engine/server/bridges/AppActivationBridge';
+import type { ProxiedApp } from '@rocket.chat/apps/dist/server/ProxiedApp';
+import { AppActivationBridge as ActivationBridge } from '@rocket.chat/apps/dist/server/bridges/AppActivationBridge';
 import { UserStatus } from '@rocket.chat/core-typings';
 import { Users } from '@rocket.chat/models';
 
 export class AppActivationBridge extends ActivationBridge {
-	// eslint-disable-next-line no-empty-function
 	constructor(private readonly orch: IAppServerOrchestrator) {
 		super();
 	}

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

@@ -1,8 +1,8 @@
 import type { IAppServerOrchestrator } from '@rocket.chat/apps';
+import { ApiBridge } from '@rocket.chat/apps/dist/server/bridges/ApiBridge';
+import type { AppApi } from '@rocket.chat/apps/dist/server/managers/AppApi';
 import type { RequestMethod } from '@rocket.chat/apps-engine/definition/accessors';
 import type { IApiRequest, IApiEndpoint, IApi } from '@rocket.chat/apps-engine/definition/api';
-import { ApiBridge } from '@rocket.chat/apps-engine/server/bridges/ApiBridge';
-import type { AppApi } from '@rocket.chat/apps-engine/server/managers/AppApi';
 import type { Response, Request, IRouter, RequestHandler } from 'express';
 import express from 'express';
 import { Meteor } from 'meteor/meteor';

apps/meteor/app/apps/server/bridges/bridges.js

@@ -1,4 +1,4 @@
-import { AppBridges } from '@rocket.chat/apps-engine/server/bridges';
+import { AppBridges } from '@rocket.chat/apps/dist/server/bridges/AppBridges';
 
 import { AppActivationBridge } from './activation';
 import { AppApisBridge } from './api';

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

@@ -1,6 +1,6 @@
 import type { IAppServerOrchestrator } from '@rocket.chat/apps';
+import { CloudWorkspaceBridge } from '@rocket.chat/apps/dist/server/bridges/CloudWorkspaceBridge';
 import type { IWorkspaceToken } from '@rocket.chat/apps-engine/definition/cloud/IWorkspaceToken';
-import { CloudWorkspaceBridge } from '@rocket.chat/apps-engine/server/bridges/CloudWorkspaceBridge';
 
 import { getWorkspaceAccessTokenWithScope } from '../../../cloud/server';
 

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

@@ -1,7 +1,7 @@
 import type { IAppServerOrchestrator, IAppsRoom, IAppsUser } from '@rocket.chat/apps';
+import { CommandBridge } from '@rocket.chat/apps/dist/server/bridges/CommandBridge';
 import type { ISlashCommand, ISlashCommandPreview, ISlashCommandPreviewItem } from '@rocket.chat/apps-engine/definition/slashcommands';
 import { SlashCommandContext } from '@rocket.chat/apps-engine/definition/slashcommands';
-import { CommandBridge } from '@rocket.chat/apps-engine/server/bridges/CommandBridge';
 import type { IMessage, RequiredField, SlashCommand, SlashCommandCallbackParams } from '@rocket.chat/core-typings';
 
 import { Utilities } from '../../../../ee/lib/misc/Utilities';

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

@@ -1,6 +1,6 @@
 import type { IAppServerOrchestrator } from '@rocket.chat/apps';
+import { ContactBridge } from '@rocket.chat/apps/dist/server/bridges/ContactBridge';
 import type { ILivechatContact } from '@rocket.chat/apps-engine/definition/livechat';
-import { ContactBridge } from '@rocket.chat/apps-engine/server/bridges';
 
 import { addContactEmail } from '../../../livechat/server/lib/contacts/addContactEmail';
 import { verifyContactChannel } from '../../../livechat/server/lib/contacts/verifyContactChannel';

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

@@ -1,6 +1,6 @@
 import type { IAppServerOrchestrator } from '@rocket.chat/apps';
+import { AppDetailChangesBridge as DetailChangesBridge } from '@rocket.chat/apps/dist/server/bridges/AppDetailChangesBridge';
 import type { ISetting } from '@rocket.chat/apps-engine/definition/settings';
-import { AppDetailChangesBridge as DetailChangesBridge } from '@rocket.chat/apps-engine/server/bridges/AppDetailChangesBridge';
 
 export class AppDetailChangesBridge extends DetailChangesBridge {
 	constructor(private readonly orch: IAppServerOrchestrator) {

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

@@ -1,6 +1,6 @@
 import type { IAppServerOrchestrator } from '@rocket.chat/apps';
+import { EmailBridge } from '@rocket.chat/apps/dist/server/bridges/EmailBridge';
 import type { IEmail } from '@rocket.chat/apps-engine/definition/email';
-import { EmailBridge } from '@rocket.chat/apps-engine/server/bridges';
 
 import * as Mailer from '../../../mailer/server/api';
 import { settings } from '../../../settings/server';

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

@@ -1,5 +1,5 @@
 import type { IAppServerOrchestrator } from '@rocket.chat/apps';
-import { EnvironmentalVariableBridge } from '@rocket.chat/apps-engine/server/bridges/EnvironmentalVariableBridge';
+import { EnvironmentalVariableBridge } from '@rocket.chat/apps/dist/server/bridges/EnvironmentalVariableBridge';
 
 export class AppEnvironmentalVariableBridge extends EnvironmentalVariableBridge {
 	allowed: Array<string>;

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

@@ -1,5 +1,5 @@
 import type { IAppServerOrchestrator } from '@rocket.chat/apps';
-import { ExperimentalBridge } from '@rocket.chat/apps-engine/server/bridges';
+import { ExperimentalBridge } from '@rocket.chat/apps/dist/server/bridges/ExperimentalBridge';
 
 export class AppExperimentalBridge extends ExperimentalBridge {
 	constructor(protected readonly orch: IAppServerOrchestrator) {

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

@@ -1,7 +1,7 @@
 import type { IAppServerOrchestrator } from '@rocket.chat/apps';
+import type { IHttpBridgeRequestInfo } from '@rocket.chat/apps/dist/server/bridges/HttpBridge';
+import { HttpBridge } from '@rocket.chat/apps/dist/server/bridges/HttpBridge';
 import type { IHttpResponse } from '@rocket.chat/apps-engine/definition/accessors';
-import type { IHttpBridgeRequestInfo } from '@rocket.chat/apps-engine/server/bridges';
-import { HttpBridge } from '@rocket.chat/apps-engine/server/bridges/HttpBridge';
 import { serverFetch as fetch, type ExtendedFetchOptions } from '@rocket.chat/server-fetch';
 import { censorUrl } from '@rocket.chat/tools';
 

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

@@ -1,3 +1 @@
-import { RealAppBridges } from './bridges';
-
-export { RealAppBridges };
+export * from './bridges';

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

@@ -1,5 +1,5 @@
 import type { IAppServerOrchestrator, IAppsSetting } from '@rocket.chat/apps';
-import { InternalBridge } from '@rocket.chat/apps-engine/server/bridges/InternalBridge';
+import { InternalBridge } from '@rocket.chat/apps/dist/server/bridges/InternalBridge';
 import type { ISetting, ISubscription } from '@rocket.chat/core-typings';
 import { Settings, Subscriptions } from '@rocket.chat/models';
 import { isTruthy } from '@rocket.chat/tools';

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

@@ -1,4 +1,4 @@
-import type { IInternalFederationBridge } from '@rocket.chat/apps-engine/server/bridges/IInternalFederationBridge';
+import type { IInternalFederationBridge } from '@rocket.chat/apps/dist/server/bridges/IInternalFederationBridge';
 import { FederationKeys } from '@rocket.chat/models';
 
 export class AppInternalFederationBridge implements IInternalFederationBridge {

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

@@ -1,4 +1,5 @@
-import type { IAppServerOrchestrator, IAppsLivechatMessage, IAppsMessage } from '@rocket.chat/apps';
+import type { IAppServerOrchestrator, IAppsLivechatMessage } from '@rocket.chat/apps';
+import { LivechatBridge } from '@rocket.chat/apps/dist/server/bridges/LivechatBridge';
 import type { IExtraRoomParams } from '@rocket.chat/apps-engine/definition/accessors/ILivechatCreator';
 import type {
 	IVisitorExternalIdentifier,
@@ -10,8 +11,7 @@ import type {
 } from '@rocket.chat/apps-engine/definition/livechat';
 import type { IMessage as IAppsEngineMessage } from '@rocket.chat/apps-engine/definition/messages';
 import type { IUser } from '@rocket.chat/apps-engine/definition/users';
-import { LivechatBridge } from '@rocket.chat/apps-engine/server/bridges/LivechatBridge';
-import type { ILivechatDepartment, IOmnichannelRoom, SelectedAgent, IMessage, ILivechatVisitor } from '@rocket.chat/core-typings';
+import type { ILivechatDepartment, IOmnichannelRoom, SelectedAgent, ILivechatVisitor } from '@rocket.chat/core-typings';
 import { OmnichannelSourceType } from '@rocket.chat/core-typings';
 import { LivechatVisitors, LivechatRooms, LivechatDepartment, Users } from '@rocket.chat/models';
 import { registerGuest } from '@rocket.chat/omni-core';
@@ -29,12 +29,6 @@ import { online } from '../../../livechat/server/lib/service-status';
 import { transfer } from '../../../livechat/server/lib/transfer';
 import { settings } from '../../../settings/server';
 
-declare module '@rocket.chat/apps/dist/converters/IAppMessagesConverter' {
-	export interface IAppMessagesConverter {
-		convertMessage(message: IMessage, cacheObj?: object): Promise<IAppsMessage>;
-	}
-}
-
 declare module '@rocket.chat/apps-engine/definition/accessors/ILivechatCreator' {
 	interface IExtraRoomParams {
 		customFields?: Record<string, unknown>;
@@ -65,7 +59,7 @@ export class AppLivechatBridge extends LivechatBridge {
 
 		// #TODO: #AppsEngineTypes - Remove explicit types and typecasts once the apps-engine definition/implementation mismatch is fixed.
 		const guest = this.orch.getConverters().get('visitors').convertAppVisitor(message.visitor);
-		const appMessage = (await this.orch.getConverters().get('messages').convertAppMessage(message)) as IMessage | undefined;
+		const appMessage = await this.orch.getConverters().get('messages').convertAppMessage(message);
 		const livechatMessage = appMessage as ILivechatMessage | undefined;
 
 		const msg = await sendMessage({
@@ -129,13 +123,12 @@ export class AppLivechatBridge extends LivechatBridge {
 					type: OmnichannelSourceType.APP,
 					id: appId,
 					alias: this.orch.getManager()?.getOneById(appId)?.getName(),
-					...(source &&
-						source.type === 'app' && {
-							sidebarIcon: source.sidebarIcon,
-							defaultIcon: source.defaultIcon,
-							label: source.label,
-							destination: source.destination,
-						}),
+					...(source?.type === 'app' && {
+						sidebarIcon: source.sidebarIcon,
+						defaultIcon: source.defaultIcon,
+						label: source.label,
+						destination: source.destination,
+					}),
 				},
 			},
 			agent: agentRoom,

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

@@ -1,8 +1,8 @@
 import type { IAppServerOrchestrator, IAppsMessage, IAppsUser } from '@rocket.chat/apps';
+import type { ITypingDescriptor } from '@rocket.chat/apps/dist/server/bridges/MessageBridge';
+import { MessageBridge } from '@rocket.chat/apps/dist/server/bridges/MessageBridge';
 import type { Reaction } from '@rocket.chat/apps-engine/definition/messages';
 import type { IRoom } from '@rocket.chat/apps-engine/definition/rooms';
-import type { ITypingDescriptor } from '@rocket.chat/apps-engine/server/bridges/MessageBridge';
-import { MessageBridge } from '@rocket.chat/apps-engine/server/bridges/MessageBridge';
 import { api } from '@rocket.chat/core-services';
 import type { IMessage } from '@rocket.chat/core-typings';
 import { Users, Subscriptions } from '@rocket.chat/models';

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

@@ -1,7 +1,7 @@
 import type { IAppServerOrchestrator } from '@rocket.chat/apps';
+import { ModerationBridge } from '@rocket.chat/apps/dist/server/bridges/ModerationBridge';
 import type { IMessage } from '@rocket.chat/apps-engine/definition/messages';
 import type { IUser } from '@rocket.chat/apps-engine/definition/users';
-import { ModerationBridge } from '@rocket.chat/apps-engine/server/bridges/ModerationBridge';
 import { ModerationReports } from '@rocket.chat/models';
 
 import { reportMessage } from '../../../../server/lib/moderation/reportMessage';

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

@@ -1,8 +1,8 @@
 import { randomUUID } from 'crypto';
 
 import type { IAppServerOrchestrator } from '@rocket.chat/apps';
+import { OAuthAppsBridge } from '@rocket.chat/apps/dist/server/bridges/OAuthAppsBridge';
 import type { IOAuthApp, IOAuthAppParams } from '@rocket.chat/apps-engine/definition/accessors/IOAuthApp';
-import { OAuthAppsBridge } from '@rocket.chat/apps-engine/server/bridges/OAuthAppsBridge';
 import type { IOAuthApps } from '@rocket.chat/core-typings';
 import { OAuthApps, Users } from '@rocket.chat/models';
 import { Random } from '@rocket.chat/random';

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

@@ -1,10 +1,10 @@
 import type { IAppServerOrchestrator } from '@rocket.chat/apps';
+import { OutboundMessageBridge } from '@rocket.chat/apps/dist/server/bridges/OutboundMessagesBridge';
 import type {
 	IOutboundEmailMessageProvider,
 	IOutboundMessageProviders,
 	IOutboundPhoneMessageProvider,
 } from '@rocket.chat/apps-engine/definition/outboundCommunication';
-import { OutboundMessageBridge } from '@rocket.chat/apps-engine/server/bridges';
 
 import { getOutboundService } from '../../../livechat/server/lib/outboundcommunication';
 

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

@@ -1,6 +1,6 @@
 import type { IAppServerOrchestrator } from '@rocket.chat/apps';
+import { PersistenceBridge } from '@rocket.chat/apps/dist/server/bridges/PersistenceBridge';
 import type { RocketChatAssociationRecord } from '@rocket.chat/apps-engine/definition/metadata';
-import { PersistenceBridge } from '@rocket.chat/apps-engine/server/bridges/PersistenceBridge';
 import type { InsertOneResult } from 'mongodb';
 
 export class AppPersistenceBridge extends PersistenceBridge {

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

@@ -1,5 +1,5 @@
 import type { IAppServerOrchestrator, IAppsRole } from '@rocket.chat/apps';
-import { RoleBridge } from '@rocket.chat/apps-engine/server/bridges';
+import { RoleBridge } from '@rocket.chat/apps/dist/server/bridges/RoleBridge';
 import type { IRole } from '@rocket.chat/core-typings';
 import { Roles } from '@rocket.chat/models';
 

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

@@ -1,10 +1,10 @@
 import type { IAppServerOrchestrator } from '@rocket.chat/apps';
+import type { GetMessagesOptions, GetRoomsFilters, GetRoomsOptions } from '@rocket.chat/apps/dist/server/bridges/RoomBridge';
+import { RoomBridge } from '@rocket.chat/apps/dist/server/bridges/RoomBridge';
 import type { IMessage, IMessageRaw } from '@rocket.chat/apps-engine/definition/messages';
 import type { IRoom, IRoomRaw } from '@rocket.chat/apps-engine/definition/rooms';
 import { RoomType } from '@rocket.chat/apps-engine/definition/rooms';
 import type { IUser } from '@rocket.chat/apps-engine/definition/users';
-import type { GetMessagesOptions, GetRoomsFilters, GetRoomsOptions } from '@rocket.chat/apps-engine/server/bridges/RoomBridge';
-import { RoomBridge } from '@rocket.chat/apps-engine/server/bridges/RoomBridge';
 import type { ISubscription, IUser as ICoreUser, IRoom as ICoreRoom, IMessage as ICoreMessage } from '@rocket.chat/core-typings';
 import { Subscriptions, Users, Rooms, Messages } from '@rocket.chat/models';
 import type { FindOptions, Sort } from 'mongodb';

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

@@ -1,9 +1,9 @@
 import type { Job } from '@rocket.chat/agenda';
 import { Agenda } from '@rocket.chat/agenda';
 import type { IAppServerOrchestrator } from '@rocket.chat/apps';
+import { SchedulerBridge } from '@rocket.chat/apps/dist/server/bridges/SchedulerBridge';
 import type { IProcessor, IOnetimeSchedule, IRecurringSchedule, IJobContext } from '@rocket.chat/apps-engine/definition/scheduler';
 import { StartupType } from '@rocket.chat/apps-engine/definition/scheduler';
-import { SchedulerBridge } from '@rocket.chat/apps-engine/server/bridges/SchedulerBridge';
 import { ObjectId } from 'bson';
 import { MongoInternals } from 'meteor/mongo';
 
@@ -90,7 +90,7 @@ export class AppSchedulerBridge extends SchedulerBridge {
 		});
 
 		if (runAfterRegister.length) {
-			return Promise.all(runAfterRegister) as Promise<Array<string>>;
+			return Promise.all(runAfterRegister);
 		}
 	}
 

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

@@ -1,7 +1,7 @@
 import { Apps, type IAppServerOrchestrator } from '@rocket.chat/apps';
+import { ServerSettingBridge } from '@rocket.chat/apps/dist/server/bridges/ServerSettingBridge';
 import type { IReadSettingPermission } from '@rocket.chat/apps-engine/definition/permissions/IPermission';
 import type { ISetting } from '@rocket.chat/apps-engine/definition/settings';
-import { ServerSettingBridge } from '@rocket.chat/apps-engine/server/bridges/ServerSettingBridge';
 import { Settings } from '@rocket.chat/models';
 
 import { updateAuditedByApp } from '../../../../server/settings/lib/auditedSettingUpdates';

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

@@ -1,6 +1,6 @@
 import type { IAppServerOrchestrator } from '@rocket.chat/apps';
+import { ThreadBridge } from '@rocket.chat/apps/dist/server/bridges/ThreadBridge';
 import type { IMessage } from '@rocket.chat/apps-engine/definition/messages';
-import { ThreadBridge } from '@rocket.chat/apps-engine/server/bridges/ThreadBridge';
 
 export class AppThreadBridge extends ThreadBridge {
 	constructor(private readonly orch: IAppServerOrchestrator) {

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

@@ -1,7 +1,7 @@
 import type { IAppServerOrchestrator } from '@rocket.chat/apps';
+import { UiInteractionBridge as AppsEngineUiInteractionBridge } from '@rocket.chat/apps/dist/server/bridges/UiInteractionBridge';
 import type { IUIKitInteraction } from '@rocket.chat/apps-engine/definition/uikit';
 import type { IUser } from '@rocket.chat/apps-engine/definition/users';
-import { UiInteractionBridge as AppsEngineUiInteractionBridge } from '@rocket.chat/apps-engine/server/bridges/UiInteractionBridge';
 import { api } from '@rocket.chat/core-services';
 import type * as UiKit from '@rocket.chat/ui-kit';
 

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

@@ -1,7 +1,7 @@
 import type { IAppServerOrchestrator } from '@rocket.chat/apps';
+import { UploadBridge } from '@rocket.chat/apps/dist/server/bridges/UploadBridge';
 import type { IUpload } from '@rocket.chat/apps-engine/definition/uploads';
 import type { IUploadDetails } from '@rocket.chat/apps-engine/definition/uploads/IUploadDetails';
-import { UploadBridge } from '@rocket.chat/apps-engine/server/bridges/UploadBridge';
 
 import { determineFileType } from '../../../../ee/lib/misc/determineFileType';
 import { FileUpload } from '../../../file-upload/server';

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

@@ -1,6 +1,6 @@
 import type { IAppServerOrchestrator } from '@rocket.chat/apps';
+import { UserBridge } from '@rocket.chat/apps/dist/server/bridges/UserBridge';
 import type { IUserCreationOptions, IUser, UserType } from '@rocket.chat/apps-engine/definition/users';
-import { UserBridge } from '@rocket.chat/apps-engine/server/bridges/UserBridge';
 import { Presence } from '@rocket.chat/core-services';
 import type { UserStatus } from '@rocket.chat/core-typings';
 import { Subscriptions, Users } from '@rocket.chat/models';

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

@@ -1,7 +1,7 @@
 import type { IAppServerOrchestrator } from '@rocket.chat/apps';
+import { VideoConferenceBridge } from '@rocket.chat/apps/dist/server/bridges/VideoConferenceBridge';
 import type { IVideoConfProvider } from '@rocket.chat/apps-engine/definition/videoConfProviders';
 import type { AppVideoConference, VideoConference } from '@rocket.chat/apps-engine/definition/videoConferences';
-import { VideoConferenceBridge } from '@rocket.chat/apps-engine/server/bridges/VideoConferenceBridge';
 import { VideoConf } from '@rocket.chat/core-services';
 
 import { videoConfProviders } from '../../../../server/lib/videoConfProviders';

apps/meteor/app/statistics/server/lib/getAppsStatistics.ts

@@ -1,6 +1,6 @@
 import { Apps } from '@rocket.chat/apps';
+import { AppInstallationSource } from '@rocket.chat/apps/dist/server/storage/IAppStorageItem';
 import { AppStatus, AppStatusUtils } from '@rocket.chat/apps-engine/definition/AppStatus';
-import { AppInstallationSource } from '@rocket.chat/apps-engine/server/storage';
 import mem from 'mem';
 
 import { SystemLogger } from '../../../../server/lib/logger/system';