feat: new apps logger deno-runtime

apps/meteor/ee/server/apps/orchestrator.js

@@ -21,7 +21,7 @@ import { AppThreadsConverter } from '../../../app/apps/server/converters/threads
 import { settings, settingsRegistry } from '../../../app/settings/server';
 import { canEnableApp } from '../../app/license/server/canEnableApp';
 import { AppServerNotifier, AppsRestApi, AppUIKitInteractionApi } from './communication';
-import { AppRealLogsStorage, AppRealStorage, ConfigurableAppSourceStorage } from './storage';
+import { AppRealLogStorage, AppRealStorage, ConfigurableAppSourceStorage } from './storage';
 
 function isTesting() {
 	return process.env.TEST_MODE === 'true';
@@ -54,7 +54,7 @@ export class AppServerOrchestrator {
 		this._logModel = AppLogs;
 		this._persistModel = AppsPersistence;
 		this._storage = new AppRealStorage(this._model);
-		this._logStorage = new AppRealLogsStorage(this._logModel);
+		this._logStorage = new AppRealLogStorage(this._logModel);
 		this._appSourceStorage = new ConfigurableAppSourceStorage(appsSourceStorageType, appsSourceStorageFilesystemPath);
 
 		this._converters = new Map();

apps/meteor/ee/server/apps/storage/AppRealLogStorage.ts

@@ -0,0 +1,36 @@
+import type { ILoggerStorageEntry } from '@rocket.chat/apps-engine/server/logging';
+import type { IAppLogStorageFindOptions } from '@rocket.chat/apps-engine/server/storage';
+import { AppLogStorage } from '@rocket.chat/apps-engine/server/storage';
+import { InstanceStatus } from '@rocket.chat/instance-status';
+import type { AppLogs } from '@rocket.chat/models';
+
+export class AppRealLogStorage extends AppLogStorage {
+	constructor(private db: typeof AppLogs) {
+		super('mongodb');
+	}
+
+	async find(
+		query: {
+			[field: string]: any;
+		},
+		options?: IAppLogStorageFindOptions,
+	): Promise<ILoggerStorageEntry[]> {
+		return this.db.find({ ...options, ...query }).toArray();
+	}
+
+	async storeEntries(logEntry: ILoggerStorageEntry): Promise<ILoggerStorageEntry> {
+		logEntry.instanceId = InstanceStatus.id();
+
+		const id = (await this.db.insertOne(logEntry)).insertedId;
+
+		return this.db.findOneById(id);
+	}
+
+	async getEntriesFor(appId: string): Promise<ILoggerStorageEntry[]> {
+		return this.db.find({ appId }).toArray();
+	}
+
+	async removeEntriesFor(appId: string): Promise<void> {
+		await this.db.deleteOne({ appId });
+	}
+}

apps/meteor/ee/server/apps/storage/index.js

@@ -1,6 +1,6 @@
 import './AppFileSystemSourceStorage';
 import './AppGridFSSourceStorage';
 
-export { AppRealLogsStorage } from './logs-storage';
+export { AppRealLogStorage } from './AppRealLogStorage';
 export { AppRealStorage } from './AppRealStorage';
 export { ConfigurableAppSourceStorage } from './ConfigurableAppSourceStorage';

packages/model-typings/src/models/IAppLogsModel.ts

@@ -1,6 +1,9 @@
+import type { DeleteResult, Filter } from 'mongodb';
+
 import type { IBaseModel } from './IBaseModel';
 
 // TODO: type for AppLogs
 export interface IAppLogsModel extends IBaseModel<any> {
 	resetTTLIndex(expireAfterSeconds: number): Promise<void>;
+	remove(query: Filter<any>): Promise<DeleteResult>;
 }