* frontend: update icons for Rooms and Recordings in console navigation * frontend: enhance overview component with user stats and improved layout * frontend: implement theme service and design tokens for light/dark mode support - Added ThemeService to manage theme preferences and system theme detection. - Introduced design tokens for consistent styling across light and dark themes. - Updated components to utilize the new navigation service for routing. - Replaced SecurityPreferencesComponent with PreferencesComponent for settings. - Enhanced UI with new styles and improved navigation structure. - Added tests for ThemeService to ensure functionality. * frontend: enhance overview component with title styling and icon integration * frontend: remove unused Router import from overview component * frontend: implement developers settings with API key and webhook configuration * frontend: update styles and structure for console navigation and overview components * frontend: simplify API key checks and integrate notification service for user feedback * frontend: update openvidu-components-angular to version 3.3.0-dev2 and simplify Material Symbols stylesheet link * frontend: adjust padding and gap for stat card and actions in overview component * frontend: update import paths to use relative paths for better module resolution * frontend: enhance sync-types.sh script with advanced options and detailed usage instructions * typings: update TypeScript declaration files and improve sync-types.sh script for better clarity and functionality * webcomponent: webcomponent typings are now moved to typings directory * Revert "typings: update TypeScript declaration files and improve sync-types.sh script for better clarity and functionality" This reverts commit 7da952bc44be20c3f74ffb82bf941b96b78ad019. * typings: improve sync-types.sh script for clarity and consistency * test: update error message for empty downloaded file check * frontend: update outbound event message types in video room and web component manager services * frontend: enhance styling for console component and adjust nav item border radius * style: update comments in disabled class for clarity and consistency; refactor import paths in room-form component * typings: update import paths in message.type.ts to include file extensions * frontend: enhance rooms management interface with improved loading states, search functionality, and table features * frontend: enhance loading state with improved UI and animations for room loading process * frontend: enhance rooms table with auto-deletion feature and improve status display * frontend: update import paths for services and add containsRoute method to NavigationService * frontend: remove unused components and associated files from shared-meet-components * frontend: add logo selector component and enhance preferences settings with access controls * frontend: add SessionStorageService import to extract query params guard * frontend: add margin-bottom utility class to overview container * frontend: update description for creating a room in the overview component * frontend: Added recording list component * frontend: update padding in mat-sidenav entry to use spacing variable * frontend: update text for delete room button to use lowercase * frontend: enhance console navigation with tooltips and active item styling * frontend: refactor styles in console navigation for consistency and improved theming * frontend: add border to card header for improved visual separation * frontend: created room list reusable component * frontend: adjust vertical alignment of table cells in recording lists * frontend: enhance room status and auto-deletion indicators with tooltips and improved styling * frontend: enhance HTTP service methods to include status codes in responses * frontend: fix duration formatting to use integer seconds instead of fixed-point * frontend: refactor icon styles in status badge for consistency * Add modular SCSS structure for design tokens, mixins, animations, and utility classes - Introduced _animations.scss for keyframes and animation utility classes. - Refactored _design-tokens.scss to import modular design system files for better maintainability. - Created _mixins-components.scss for component-specific mixins like cards and buttons. - Added _mixins-layout.scss for layout-related mixins and responsive design utilities. - Established _mixins-responsive.scss for breakpoint mixins to facilitate responsive design. - Introduced _tokens-core.scss for core design tokens including colors, spacing, and typography. - Created _tokens-themes.scss for theme-specific design tokens for light and dark modes. - Added _utilities.scss for reusable utility classes to streamline common styling patterns. * frontend: Refactor styles for settings preferences component and enhance utility classes - Simplified SCSS for preferences.component.scss by utilizing utility classes for layout and styling. - Introduced new utility classes for Material components, including slide toggle and navigation list. - Enhanced form section styling with consistent spacing and layout adjustments. - Added responsive design patterns for toolbar and table components. - Improved loading and empty state styles for better user experience. * frontend: standardize page layout and loading states across components * frontend: enhance status badge and action button styles for consistency * ci: update unit test workflow to include typings setup * test: update import path for WebComponentCommand to typings directory * frontend: refactor dialog component structure and enhance styles for improved accessibility and responsiveness * frontend: rename batchDelete methods to bulkDelete for consistency * frontend: implement confirmation dialog for room deletion with improved error handling * frontend: extract feature-specific API logic from HttpService into dedicated services * frontend: extract common recording actions into RecordingManagerService * frontend: refactor navigation handling for improved consistency * backend: add endpoint to download multiple recordings in a zip file and refactor bulkDeleteRecordings to delete only recordings from the same room if recording token is provided * openapi: add download endpoint for recordings and update bulk delete logic to enforce room constraints * frontend: enhance recording media URL generation and add bulk delete and download functionalities * frontend: rename 'batchDownload' to 'bulkDownload' for consistency and implement missing methods in RecordingsComponent * frontend: Implement Room Creation Wizard with Step Indicator and Navigation - Added StepIndicatorComponent for visual step tracking in the wizard. - Created WizardNavComponent for navigation controls (Next, Previous, Cancel, Finish). - Developed RoomWizardComponent to manage the wizard's state and steps. - Introduced WizardStateService to handle the wizard's data and navigation logic. - Defined WizardStep and WizardNavigationConfig models for step management. - Implemented basic structure for individual steps: Basic Info, Recording Settings, Recording Trigger, Recording Layout, and Preferences. - Integrated components into the room creation flow, allowing users to navigate through steps. - Added unit tests for all new components and services to ensure functionality. * feat(wizard): enhance wizard functionality and UI - Added validation form groups to WizardStep interface for better form handling. - Updated WizardNavigationConfig to include customizable button labels and states. - Implemented step navigation with event handling in room-wizard component. - Refactored basic info step into a standalone component with reactive form support. - Improved styling for the basic info step and action buttons. - Enhanced wizard state management to handle dynamic step visibility based on user input. - Added methods for loading existing data and saving form changes automatically. - Updated tests to reflect changes in component structure and functionality. * feat(recording-preferences): implement recording preferences step with form and options * feat(room-wizard): add recording trigger step with selectable options and form handling * feat(recording-preferences): refactor option selection to use SelectableCard component and update styles * test: add tests for download recordings endpoint and update tests for bulk delete recordings * openapi: improve descriptions for bulk delete operations and add new response for marked rooms * frontend: update bulk actions and add sharing functionality in RecordingsComponent, and enhace RecordingListsComponent * frontend: implement bulkDeleteRooms method and enhace RoomsComponent and RoomListsComponent * typings: add MeetApiKey interface * backend: update API key handling to use MeetApiKey type * openapi: create API key schema and update response references * backend: add webhook URL testing functionality and validation * frontend: simplify HTTP request methods by removing response observation * frontend: streamline OverviewComponent by removing unused observables and simplifying data loading * frontend: add API key management methods to AuthService * frontend: enhance GlobalPreferencesService by adding webhook preferences management * frontend: refactor DevelopersSettingsComponent to improve API key handling and streamline webhook configuration * openapi: add webhook URL testing endpoint with request and response schemas * test: add tests for webhook URL validation * frontend: enhance PreferencesComponent and add changePassword method in AuthService * feat(recording-preferences): add recording access control options and enhance UI animations * feat(recording-layout): implement recording layout selection step with form handling and visual options * feat(room-preferences): implement room preferences step with form handling and toggle options * feat(room-wizard): enhance form handling and default value saving across components * feat(layouts): add new layout images for grid, single speaker, and speaker configurations * feat(developers): adjust API key field button padding and update spacing in API key display * feat(rooms-lists): enhance button formatting and add tooltips for room status and auto-deletion * feat(room-wizard): update room creation logic and form field names for consistency * feat(room-wizard): add skip button functionality and enhance navigation handling * feat(basic-info): simplify form layout by removing action buttons and related styles * fix(wizard-navigation): change currentStepId type from string to number for consistency * feat(styles): enhance button padding and hover effect in batch actions for improved usability * fix(wizard-navigation): adjust padding for improved layout consistency * feat(basic-info): add clear button for deletion date and enhance time selection layout * feat(rooms-list): enhance deletion date display with new styling and structure * fix(basic-info): remove debugger statement from saveFormData method * refactor(step-indicator): remove commented-out styles for cleaner code * feat(step-indicator): enhance responsive layout handling and emit layout changes * feat(overview): improve loading state handling and update stats management * feat(step-indicator): enable navigation between steps and improve layout handling * feat(room-wizard): refactor state management to use MeetRoomOptions and improve data handling across components * feat(step-indicator): enhance layout handling and improve text overflow management for better responsiveness * feat(step-indicator): update step properties to enhance navigation and state management * feat(room-wizard): add 'Create Room' label to finish button in navigation config * openapi: add force-deletion parameter to delete room endpoint * frontend: split code in ContextService into domain specific services and rename it to AppDataSerivce * frontend: enhace FeatureConfigurationService to use signal-based approach and remove unused preferences and permissions * feat(basic-info): update deletion hint icon and improve warning color consistency * feat(room-service): rename saveRoomPreferences to updateRoom and adjust API path for preference updates * feat(room-wizard): implement edit mode for room configuration, allowing users to update existing room settings * feat(pro-feature-badge): create ProFeatureBadge component and integrate into logo selector and selectable card * fix(recording): adjust compression level for zip archive in downloadRecordingsZip * fix(internal-config): remove FIXME comments related to LK bug for meeting timeouts * frontend: reorganize imports and remove unused components * refactor(console): rename 'Developers' to 'Embedded' in navigation and update related routes * fix(console-nav): update toolbar title from 'OpenVidu Console' to 'OpenVidu Meet' * feat(users-permissions): create UsersPermissions component and update routing * feat(users-permissions): add pro feature badge to user authentication section * fix(overview): update navigation and text from 'Developers' to 'Embedded' * feat(overview): update authentication configuration card and navigation * frontend: refactor RoomRecordingsComponent to use RecordingListsComponent * refactor: update API paths to remove 'meet' prefix for consistency * frontend: update navigation paths to remove 'console' prefix for consistency * feat(video-room): add leave and end meeting functionality with toolbar buttons * fix(overview): remove unnecessary comment on initial loading state * feat(wizard): enable quick create functionality in wizard navigation * feat(step-indicator): implement safe current step index handling for edit mode * feat(wizard): update quick create visibility to show only on first step in edit mode * feat(users-permissions): refactor admin password handling and validation * webcomponent: update Playwright dependencies and refactor leaveRoom functionality - Updated Playwright and Playwright Test versions in package.json to 1.53.2. - Refactored leaveRoom function to accept a role parameter, allowing for different behavior based on user role (moderator or publisher). - Updated E2E tests to utilize the new leaveRoom function, ensuring proper cleanup and behavior for both roles. - Removed unnecessary afterEach cleanup in UI Feature Preferences tests. * frontend: add IDs to leave and end meeting buttons for better accessibility * testapp: update package-lock.json and refactor ConfigService constructor for improved environment variable handling * frontend: update background colors for improved visual consistency * chore: add tslib dependency and enhance target directory validation in sync-types.sh * frontend: enhance accessibility by adding IDs to toolbar and form elements --------- Co-authored-by: juancarmore <juancar_more2@hotmail.com>
236 lines
7.3 KiB
TypeScript
236 lines
7.3 KiB
TypeScript
import {
|
|
MeetRecordingInfo,
|
|
MeetRoom,
|
|
MeetWebhookEvent,
|
|
MeetWebhookEventType,
|
|
MeetWebhookPayload,
|
|
WebhookPreferences
|
|
} from '@typings-ce';
|
|
import crypto from 'crypto';
|
|
import { inject, injectable } from 'inversify';
|
|
import { MEET_API_KEY } from '../environment.js';
|
|
import { AuthService, LoggerService, MeetStorageService } from './index.js';
|
|
import { errorWebhookUrlUnreachable } from '../models/error.model.js';
|
|
|
|
@injectable()
|
|
export class OpenViduWebhookService {
|
|
constructor(
|
|
@inject(LoggerService) protected logger: LoggerService,
|
|
@inject(MeetStorageService) protected globalPrefService: MeetStorageService,
|
|
@inject(AuthService) protected authService: AuthService
|
|
) {}
|
|
|
|
/**
|
|
* Sends a webhook notification when a meeting has started.
|
|
*
|
|
* This method triggers a background webhook event to notify external systems
|
|
* that a meeting session has begun for the specified room.
|
|
*
|
|
* @param room - The meeting room object containing room details
|
|
*/
|
|
sendMeetingStartedWebhook(room: MeetRoom) {
|
|
this.sendWebhookEventInBackground(MeetWebhookEventType.MEETING_STARTED, room, `Room ID: ${room.roomId}`);
|
|
}
|
|
|
|
/**
|
|
* Sends a webhook notification when a meeting has ended.
|
|
*
|
|
* This method triggers a background webhook event to notify external systems
|
|
* that a meeting session has concluded for the specified room.
|
|
*
|
|
* @param room - The MeetRoom object containing details of the ended meeting
|
|
*/
|
|
sendMeetingEndedWebhook(room: MeetRoom) {
|
|
this.sendWebhookEventInBackground(MeetWebhookEventType.MEETING_ENDED, room, `Room ID: ${room.roomId}`);
|
|
}
|
|
|
|
/**
|
|
* Sends a webhook event notification when a recording has started.
|
|
*
|
|
* This method triggers a background webhook event to notify external systems
|
|
* that a meeting recording has been initiated.
|
|
*
|
|
* @param recordingInfo - The recording information containing details about the started recording
|
|
*/
|
|
sendRecordingUpdatedWebhook(recordingInfo: MeetRecordingInfo) {
|
|
this.sendWebhookEventInBackground(
|
|
MeetWebhookEventType.RECORDING_UPDATED,
|
|
recordingInfo,
|
|
`Recording ID: ${recordingInfo.recordingId}`
|
|
);
|
|
}
|
|
|
|
/**
|
|
* Sends a webhook notification when a recording has started.
|
|
*
|
|
* This method triggers a background webhook event to notify external services
|
|
* that a meeting recording has begun. The webhook includes the recording
|
|
* information and uses the recording ID for identification purposes.
|
|
*
|
|
* @param recordingInfo - The recording information containing details about the started recording
|
|
*/
|
|
sendRecordingStartedWebhook(recordingInfo: MeetRecordingInfo) {
|
|
this.sendWebhookEventInBackground(
|
|
MeetWebhookEventType.RECORDING_STARTED,
|
|
recordingInfo,
|
|
`Recording ID: ${recordingInfo.recordingId}`
|
|
);
|
|
}
|
|
|
|
/**
|
|
* Sends a webhook notification when a recording has ended.
|
|
*
|
|
* This method triggers a background webhook event to notify external systems
|
|
* that a meeting recording has completed.
|
|
*
|
|
* @param recordingInfo - The recording information containing details about the ended recording
|
|
*/
|
|
sendRecordingEndedWebhook(recordingInfo: MeetRecordingInfo) {
|
|
this.sendWebhookEventInBackground(
|
|
MeetWebhookEventType.RECORDING_ENDED,
|
|
recordingInfo,
|
|
`Recording ID: ${recordingInfo.recordingId}`
|
|
);
|
|
}
|
|
|
|
/**
|
|
* Tests a webhook URL by sending a test event to it.
|
|
*
|
|
* This method sends a test event to the specified webhook URL to verify if it is reachable and functioning correctly.
|
|
* If the request fails, it throws an error indicating that the webhook URL is unreachable.
|
|
*
|
|
* @param url - The webhook URL to test
|
|
*/
|
|
async testWebhookUrl(url: string) {
|
|
const creationDate = Date.now();
|
|
const data = {
|
|
event: 'testEvent',
|
|
creationDate,
|
|
data: {
|
|
message: 'This is a test webhook event'
|
|
}
|
|
};
|
|
|
|
try {
|
|
await this.sendRequest(url, {
|
|
method: 'POST',
|
|
headers: {
|
|
'Content-Type': 'application/json'
|
|
},
|
|
body: JSON.stringify(data)
|
|
});
|
|
} catch (error) {
|
|
this.logger.error(`Error testing webhook URL ${url}: ${error}`);
|
|
throw errorWebhookUrlUnreachable(url);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Sends a webhook event asynchronously in the background without blocking the main execution flow.
|
|
* If the webhook fails, logs a warning message with the error details and optional context information.
|
|
*
|
|
* @param event - The type of webhook event to send
|
|
* @param payload - The data payload to include with the webhook event
|
|
* @param context - Optional context string to include in error messages for debugging purposes
|
|
*/
|
|
protected sendWebhookEventInBackground(
|
|
event: MeetWebhookEventType,
|
|
payload: MeetWebhookPayload,
|
|
context?: string
|
|
): void {
|
|
this.sendWebhookEvent(event, payload).catch((error) => {
|
|
const contextInfo = context ? ` (${context})` : '';
|
|
this.logger.warn(`Background webhook ${event} failed${contextInfo}: ${error}`);
|
|
});
|
|
}
|
|
|
|
protected async sendWebhookEvent(event: MeetWebhookEventType, payload: MeetWebhookPayload) {
|
|
const webhookPreferences = await this.getWebhookPreferences();
|
|
|
|
if (!webhookPreferences.enabled) return;
|
|
|
|
const creationDate = Date.now();
|
|
const data: MeetWebhookEvent = {
|
|
event,
|
|
creationDate,
|
|
data: payload
|
|
};
|
|
|
|
this.logger.info(`Sending webhook event ${data.event}`);
|
|
|
|
try {
|
|
const signature = await this.generateWebhookSignature(creationDate, data);
|
|
|
|
await this.fetchWithRetry(webhookPreferences.url!, {
|
|
method: 'POST',
|
|
headers: {
|
|
'Content-Type': 'application/json',
|
|
'X-Timestamp': creationDate.toString(),
|
|
'X-Signature': signature
|
|
},
|
|
body: JSON.stringify(data)
|
|
});
|
|
} catch (error) {
|
|
this.logger.error(`Error sending webhook event ${data.event}: ${error}`);
|
|
throw error;
|
|
}
|
|
}
|
|
|
|
protected async generateWebhookSignature(timestamp: number, payload: object): Promise<string> {
|
|
const apiKey = await this.getApiKey();
|
|
return crypto
|
|
.createHmac('sha256', apiKey)
|
|
.update(`${timestamp}.${JSON.stringify(payload)}`)
|
|
.digest('hex');
|
|
}
|
|
|
|
protected async fetchWithRetry(url: string, options: RequestInit, retries = 5, delay = 300): Promise<void> {
|
|
try {
|
|
await this.sendRequest(url, options);
|
|
} catch (error) {
|
|
if (retries <= 0) {
|
|
throw new Error(`Request failed: ${error}`);
|
|
}
|
|
|
|
this.logger.warn(`Retrying in ${delay / 1000} seconds... (${retries} retries left)`);
|
|
await new Promise((resolve) => setTimeout(resolve, delay));
|
|
// Retry the request after a delay with exponential backoff
|
|
return this.fetchWithRetry(url, options, retries - 1, delay * 2);
|
|
}
|
|
}
|
|
|
|
protected async sendRequest(url: string, options: RequestInit): Promise<void> {
|
|
const response = await fetch(url, options);
|
|
|
|
if (!response.ok) {
|
|
throw new Error(`Request failed with status ${response.status}`);
|
|
}
|
|
}
|
|
|
|
protected async getWebhookPreferences(): Promise<WebhookPreferences> {
|
|
try {
|
|
const { webhooksPreferences } = await this.globalPrefService.getGlobalPreferences();
|
|
return webhooksPreferences;
|
|
} catch (error) {
|
|
this.logger.error('Error getting webhook preferences:', error);
|
|
throw error;
|
|
}
|
|
}
|
|
|
|
protected async getApiKey(): Promise<string> {
|
|
const apiKeys = await this.authService.getApiKeys();
|
|
|
|
if (apiKeys.length === 0) {
|
|
// If no API keys are configured, check if the MEET_API_KEY environment variable is set
|
|
if (MEET_API_KEY) {
|
|
return MEET_API_KEY;
|
|
}
|
|
|
|
throw new Error('There are no API keys configured yet. Please, create one to use webhooks.');
|
|
}
|
|
|
|
// Return the first API key
|
|
return apiKeys[0].key;
|
|
}
|
|
}
|