From 5d16528f82c8b7794a52da0392bde4e0eabdd5b3 Mon Sep 17 00:00:00 2001
From: csantosm <4a.santos@gmail.com>
Date: Mon, 14 Feb 2022 14:12:58 +0100
Subject: [PATCH] openvidu-components: Updated library config

---
 .../lib/components/stream/stream.component.html  |  8 --------
 .../lib/components/stream/stream.component.ts    |  2 --
 .../lib/components/toolbar/toolbar.component.css |  4 ++--
 .../components/toolbar/toolbar.component.html    |  6 ++----
 .../lib/components/toolbar/toolbar.component.ts  |  7 ++-----
 .../videoconference/videoconference.component.ts |  2 --
 .../src/lib/config/lib.config.ts                 |  9 +++++----
 .../src/lib/openvidu-angular.module.ts           |  4 ++--
 .../library-config/library-config.service.ts     | 15 +++++++++------
 .../services/participant/participant.service.ts  | 16 ++++++++++++----
 10 files changed, 34 insertions(+), 39 deletions(-)

diff --git a/openvidu-components-angular/projects/openvidu-angular/src/lib/components/stream/stream.component.html b/openvidu-components-angular/projects/openvidu-angular/src/lib/components/stream/stream.component.html
index 7b3396cc..f64a7593 100644
--- a/openvidu-components-angular/projects/openvidu-angular/src/lib/components/stream/stream.component.html
+++ b/openvidu-components-angular/projects/openvidu-angular/src/lib/components/stream/stream.component.html
@@ -43,9 +43,6 @@
 
 
 	<div class="status-icons">
-		<!-- <div id="statusMic" *ngIf="!this._stream.streamManager?.stream?.audioActive">
-			<mat-icon>mic_off</mat-icon>
-		</div> -->
 
 		<button mat-icon-button id="statusMic" *ngIf="!this._stream.streamManager?.stream?.audioActive" disabled>
 			<mat-icon>mic_off</mat-icon>
@@ -54,11 +51,6 @@
 
 	<div class="videoButtons">
 
-		<!-- Custom stream notifications -->
-		<ng-container *ngIf="notificationTemplate">
-			<ng-container *ngTemplateOutlet="notificationTemplate; context: { stream: _stream }"></ng-container>
-		</ng-container>
-
 		<button mat-icon-button (click)="toggleVideoMenu($event)" matTooltip="Settings" aria-label="Video settings menu">
 			<mat-icon>more_vert</mat-icon>
 		</button>
diff --git a/openvidu-components-angular/projects/openvidu-angular/src/lib/components/stream/stream.component.ts b/openvidu-components-angular/projects/openvidu-angular/src/lib/components/stream/stream.component.ts
index 55aaf140..52ce7013 100644
--- a/openvidu-components-angular/projects/openvidu-angular/src/lib/components/stream/stream.component.ts
+++ b/openvidu-components-angular/projects/openvidu-angular/src/lib/components/stream/stream.component.ts
@@ -22,8 +22,6 @@ import { ParticipantService } from '../../services/participant/participant.servi
 	styleUrls: ['./stream.component.css']
 })
 export class StreamComponent implements OnInit {
-	@ContentChild('notification', { read: TemplateRef }) notificationTemplate: TemplateRef<any>;
-
 	videoSizeIconEnum = VideoSizeIcon;
 	videoTypeEnum = VideoType;
 	videoSizeIcon: VideoSizeIcon = VideoSizeIcon.BIG;
diff --git a/openvidu-components-angular/projects/openvidu-angular/src/lib/components/toolbar/toolbar.component.css b/openvidu-components-angular/projects/openvidu-angular/src/lib/components/toolbar/toolbar.component.css
index 4c7809f9..d60f1930 100644
--- a/openvidu-components-angular/projects/openvidu-angular/src/lib/components/toolbar/toolbar.component.css
+++ b/openvidu-components-angular/projects/openvidu-angular/src/lib/components/toolbar/toolbar.component.css
@@ -15,7 +15,7 @@
 	align-items: center;
 }
 
-#media-buttons-container button, ::ng-deep #media-buttons-container>.ng-star-inserted {
+#media-buttons-container > *, ::ng-deep #media-buttons-container > * {
 	width: 40px;
 	height: 40px;
 	background-color: var(--ov-secondary-color);
@@ -26,7 +26,7 @@
 	background-color: var(--ov-warn-color) !important;
 }
 
-.active-btn {
+.active-btn, ::ng-deep .active-btn {
 	background-color: var(--ov-tertiary-color) !important;
 }
 
diff --git a/openvidu-components-angular/projects/openvidu-angular/src/lib/components/toolbar/toolbar.component.html b/openvidu-components-angular/projects/openvidu-angular/src/lib/components/toolbar/toolbar.component.html
index b8d6d6ec..e22db811 100644
--- a/openvidu-components-angular/projects/openvidu-angular/src/lib/components/toolbar/toolbar.component.html
+++ b/openvidu-components-angular/projects/openvidu-angular/src/lib/components/toolbar/toolbar.component.html
@@ -61,10 +61,8 @@
 			<mat-icon *ngIf="!isFullscreenEnabled" matTooltip="Fullscreen">fullscreen</mat-icon>
 		</button>
 
-		<!-- Custom centered buttons -->
-		<ng-container *ngIf="centeredButtonsTemplate">
-			<ng-container *ngTemplateOutlet="centeredButtonsTemplate"></ng-container>
-		</ng-container>
+		<!-- Custom toolbar buttons -->
+		<ng-content select="[toolbar-btn]"></ng-content>
 
 		<!-- Leave session button -->
 		<button mat-icon-button (click)="leaveSession()" id="leave-btn">
diff --git a/openvidu-components-angular/projects/openvidu-angular/src/lib/components/toolbar/toolbar.component.ts b/openvidu-components-angular/projects/openvidu-angular/src/lib/components/toolbar/toolbar.component.ts
index 6d8d0372..46768229 100644
--- a/openvidu-components-angular/projects/openvidu-angular/src/lib/components/toolbar/toolbar.component.ts
+++ b/openvidu-components-angular/projects/openvidu-angular/src/lib/components/toolbar/toolbar.component.ts
@@ -102,11 +102,8 @@ export class ToolbarComponent implements OnInit, OnDestroy {
 
 		this.subscribeToUserMediaProperties();
 		this.subscribeToReconnection();
-
-		if(!this.libraryConfigSrv.isUsingProLibrary()){
-			this.subscribeToMenuToggling();
-			this.subscribeToChatMessages();
-		}
+		this.subscribeToMenuToggling();
+		this.subscribeToChatMessages();
 	}
 
 	toggleMicrophone() {
diff --git a/openvidu-components-angular/projects/openvidu-angular/src/lib/components/videoconference/videoconference.component.ts b/openvidu-components-angular/projects/openvidu-angular/src/lib/components/videoconference/videoconference.component.ts
index 620b92aa..984b21c5 100644
--- a/openvidu-components-angular/projects/openvidu-angular/src/lib/components/videoconference/videoconference.component.ts
+++ b/openvidu-components-angular/projects/openvidu-angular/src/lib/components/videoconference/videoconference.component.ts
@@ -9,8 +9,6 @@ import { StreamDirective } from '../../directives/stream/stream.directive';
 export class VideoconferenceComponent implements OnInit {
 	streamTemplate: TemplateRef<any>;
 
-	// @ContentChild('layout', { read: TemplateRef }) layoutTemplate: TemplateRef<any>;
-
 	@ContentChild(StreamDirective)
 	set customStream(customStream: StreamDirective) {
 		if (customStream) {
diff --git a/openvidu-components-angular/projects/openvidu-angular/src/lib/config/lib.config.ts b/openvidu-components-angular/projects/openvidu-angular/src/lib/config/lib.config.ts
index 5c9f3fdc..75e65db9 100644
--- a/openvidu-components-angular/projects/openvidu-angular/src/lib/config/lib.config.ts
+++ b/openvidu-components-angular/projects/openvidu-angular/src/lib/config/lib.config.ts
@@ -1,6 +1,7 @@
 export interface LibConfig {
-	environment: {
-		production: boolean;
-		useProdLibrary?: boolean
-	};
+	production?: boolean,
+	participantFactory?: ParticipantFactoryFunction,
+
 }
+
+export type ParticipantFactoryFunction = (connWrapper: any, participantId: string) => any;
\ No newline at end of file
diff --git a/openvidu-components-angular/projects/openvidu-angular/src/lib/openvidu-angular.module.ts b/openvidu-components-angular/projects/openvidu-angular/src/lib/openvidu-angular.module.ts
index 32e88978..34019121 100644
--- a/openvidu-components-angular/projects/openvidu-angular/src/lib/openvidu-angular.module.ts
+++ b/openvidu-components-angular/projects/openvidu-angular/src/lib/openvidu-angular.module.ts
@@ -144,9 +144,9 @@ import { AudioWaveComponent } from './components/audio-wave/audio-wave.component
 	entryComponents: [DialogTemplateComponent]
 })
 export class OpenviduAngularModule {
-	static forRoot(environment): ModuleWithProviders<OpenviduAngularModule> {
+	static forRoot(config): ModuleWithProviders<OpenviduAngularModule> {
 		// console.log(`${library.name} config: ${environment}`);
-		const libConfig: LibConfig = { environment };
+		const libConfig: LibConfig = config;
 		return {
 			ngModule: OpenviduAngularModule,
 			providers: [LibraryConfigService, { provide: 'LIB_CONFIG', useValue: libConfig }]
diff --git a/openvidu-components-angular/projects/openvidu-angular/src/lib/services/library-config/library-config.service.ts b/openvidu-components-angular/projects/openvidu-angular/src/lib/services/library-config/library-config.service.ts
index 51c28a4b..e6885b2d 100644
--- a/openvidu-components-angular/projects/openvidu-angular/src/lib/services/library-config/library-config.service.ts
+++ b/openvidu-components-angular/projects/openvidu-angular/src/lib/services/library-config/library-config.service.ts
@@ -1,5 +1,5 @@
 import { Inject, Injectable } from '@angular/core';
-import { LibConfig } from '../../config/lib.config';
+import { LibConfig, ParticipantFactoryFunction } from '../../config/lib.config';
 
 // import { version } from '../../../../package.json';
 
@@ -10,8 +10,7 @@ export class LibraryConfigService {
 	constructor(@Inject('LIB_CONFIG') config: LibConfig) {
 		this.configuration = config;
 		console.log(this.configuration);
-		this.isUsingProLibrary() ? console.log('Using PRO library') : console.log('Using CE library');
-		if(this.isProduction()) console.log('Production Mode');
+		if(this.isProduction()) console.log('OpenVidu Angular Production Mode');
 		// console.log(version)
 	}
 
@@ -19,10 +18,14 @@ export class LibraryConfigService {
 		return this.configuration;
 	}
 	isProduction(): boolean {
-		return this.configuration?.environment?.production;
+		return this.configuration?.production;
 	}
 
-	isUsingProLibrary(): boolean {
-		return !!this.configuration?.environment?.useProdLibrary;
+	hasParticipantFactory(): boolean {
+		return typeof this.getConfig().participantFactory === "function";
+	}
+
+	getParticipantFactory(): ParticipantFactoryFunction {
+		return this.getConfig().participantFactory;
 	}
 }
diff --git a/openvidu-components-angular/projects/openvidu-angular/src/lib/services/participant/participant.service.ts b/openvidu-components-angular/projects/openvidu-angular/src/lib/services/participant/participant.service.ts
index 1620d62b..a9792fe7 100644
--- a/openvidu-components-angular/projects/openvidu-angular/src/lib/services/participant/participant.service.ts
+++ b/openvidu-components-angular/projects/openvidu-angular/src/lib/services/participant/participant.service.ts
@@ -4,6 +4,7 @@ import { BehaviorSubject, Observable } from 'rxjs';
 import { ILogger } from '../../models/logger.model';
 import { StreamModel, ParticipantAbstractModel, ParticipantModel } from '../../models/participant.model';
 import { VideoType } from '../../models/video-type.model';
+import { LibraryConfigService } from '../library-config/library-config.service';
 import { LoggerService } from '../logger/logger.service';
 
 @Injectable({
@@ -29,7 +30,7 @@ export class ParticipantService {
 
 	protected log: ILogger;
 
-	constructor(protected loggerSrv: LoggerService) {
+	constructor(protected libraryConfigSrv: LibraryConfigService, protected loggerSrv: LoggerService) {
 		this.log = this.loggerSrv.get('ParticipantService');
 
 		this.localParticipantObs = this._localParticipant.asObservable();
@@ -42,6 +43,9 @@ export class ParticipantService {
 		this.updateLocalParticipant();
 	}
 
+	getLocalParticipant(): ParticipantAbstractModel {
+		return this.localParticipant;
+	}
 	getMyParticipantId(): string {
 		return this.localParticipant.id;
 	}
@@ -189,7 +193,7 @@ export class ParticipantService {
 		return this.localParticipant.isScreenAudioActive();
 	}
 
-	protected updateLocalParticipant() {
+	updateLocalParticipant() {
 		// Cloning localParticipant object for not applying changes on the global variable
 		let participantsWithConnectionAvailable: ParticipantAbstractModel = Object.assign(this.newParticipant(), this.localParticipant);
 		const availableConnections = participantsWithConnectionAvailable.getAvailableConnections();
@@ -299,7 +303,11 @@ export class ParticipantService {
 	updateRemoteParticipants() {
 		this._remoteParticipants.next(this.remoteParticipants);
 	}
-	protected newParticipant(steramModel?: StreamModel, participantId?: string) {
-		return new ParticipantModel(steramModel, participantId);
+	protected newParticipant(streamModel?: StreamModel, participantId?: string) {
+
+		if(this.libraryConfigSrv.hasParticipantFactory()){
+			return this.libraryConfigSrv.getParticipantFactory().apply(this, [streamModel, participantId]);
+		}
+		return new ParticipantModel(streamModel, participantId);
 	}
 }