From cfef09245748d3208cd6ffa2d94c70086cf099ca Mon Sep 17 00:00:00 2001 From: csantosm <4a.santos@gmail.com> Date: Tue, 15 Feb 2022 16:24:01 +0100 Subject: [PATCH] openvidu-components: Renamed libConfig to openviduAngularConfig --- .../components/toolbar/toolbar.component.ts | 2 -- ...b.config.ts => openvidu-angular.config.ts} | 2 +- .../src/lib/openvidu-angular.module.ts | 14 ++++++------ .../openvidu-angular.config.service.mock.ts | 19 ++++++++++++++++ .../openvidu-angular.config.service.spec.ts | 22 +++++++++++++++++++ .../openvidu-angular.config.service.ts} | 10 ++++----- .../library-config.service.mock.ts | 19 ---------------- .../library-config.service.spec.ts | 22 ------------------- .../src/lib/services/logger/logger.service.ts | 6 ++--- .../lib/services/openvidu/openvidu.service.ts | 8 +++---- .../participant/participant.service.ts | 8 +++---- .../openvidu-angular/src/public-api.ts | 4 ++-- .../src/app/app.module.ts | 4 ++-- 13 files changed, 69 insertions(+), 71 deletions(-) rename openvidu-components-angular/projects/openvidu-angular/src/lib/config/{lib.config.ts => openvidu-angular.config.ts} (67%) create mode 100644 openvidu-components-angular/projects/openvidu-angular/src/lib/services/config/openvidu-angular.config.service.mock.ts create mode 100644 openvidu-components-angular/projects/openvidu-angular/src/lib/services/config/openvidu-angular.config.service.spec.ts rename openvidu-components-angular/projects/openvidu-angular/src/lib/services/{library-config/library-config.service.ts => config/openvidu-angular.config.service.ts} (65%) delete mode 100644 openvidu-components-angular/projects/openvidu-angular/src/lib/services/library-config/library-config.service.mock.ts delete mode 100644 openvidu-components-angular/projects/openvidu-angular/src/lib/services/library-config/library-config.service.spec.ts 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 76c87615..f66c9fcd 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 @@ -14,7 +14,6 @@ import { ActionService } from '../../services/action/action.service'; import { DeviceService } from '../../services/device/device.service'; import { ChatMessage } from '../../models/chat.model'; import { ParticipantService } from '../../services/participant/participant.service'; -import { LibraryConfigService } from '../../services/library-config/library-config.service'; import { MenuType } from '../../models/menu.model'; @Component({ @@ -53,7 +52,6 @@ export class ToolbarComponent implements OnInit, OnDestroy { protected webcamAudioStateSubscription: Subscription; constructor( - protected libraryConfigSrv: LibraryConfigService, protected documentService: DocumentService, protected chatService: ChatService, protected menuService: SidenavMenuService, 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/openvidu-angular.config.ts similarity index 67% rename from openvidu-components-angular/projects/openvidu-angular/src/lib/config/lib.config.ts rename to openvidu-components-angular/projects/openvidu-angular/src/lib/config/openvidu-angular.config.ts index 75e65db9..d0d91b33 100644 --- a/openvidu-components-angular/projects/openvidu-angular/src/lib/config/lib.config.ts +++ b/openvidu-components-angular/projects/openvidu-angular/src/lib/config/openvidu-angular.config.ts @@ -1,4 +1,4 @@ -export interface LibConfig { +export interface OpenViduAngularConfig { production?: boolean, participantFactory?: ParticipantFactoryFunction, 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 2bffd7d5..7e20386a 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 @@ -39,14 +39,14 @@ import { LinkifyPipe } from './pipes/linkify.pipe'; import { TooltipListPipe } from './pipes/tooltip-list.pipe'; import { StreamsEnabledPipe, NicknamePipe, ParticipantStreamsPipe } from './pipes/participant.pipe'; -import { LibConfig } from './config/lib.config'; +import { OpenViduAngularConfig } from './config/openvidu-angular.config'; import { CdkOverlayContainer } from './config/custom-cdk-overlay'; import { DeviceService } from './services/device/device.service'; import { LoggerService } from './services/logger/logger.service'; import { PlatformService } from './services/platform/platform.service'; import { StorageService } from './services/storage/storage.service'; import { TokenService } from './services/token/token.service'; -import { LibraryConfigService } from './services/library-config/library-config.service'; +import { OpenViduAngularConfigService } from './services/config/openvidu-angular.config.service'; import { OpenViduService } from './services/openvidu/openvidu.service'; import { ActionService } from './services/action/action.service'; import { ChatService } from './services/chat/chat.service'; @@ -142,13 +142,13 @@ import { AudioWaveComponent } from './components/audio-wave/audio-wave.component ], entryComponents: [DialogTemplateComponent] }) -export class OpenviduAngularModule { - static forRoot(config): ModuleWithProviders { +export class OpenViduAngularModule { + static forRoot(config): ModuleWithProviders { // console.log(`${library.name} config: ${environment}`); - const libConfig: LibConfig = config; + const libConfig: OpenViduAngularConfig = config; return { - ngModule: OpenviduAngularModule, - providers: [LibraryConfigService, { provide: 'LIB_CONFIG', useValue: libConfig }] + ngModule: OpenViduAngularModule, + providers: [OpenViduAngularConfigService, { provide: 'OPENVIDU_ANGULAR_CONFIG', useValue: libConfig }] }; } } diff --git a/openvidu-components-angular/projects/openvidu-angular/src/lib/services/config/openvidu-angular.config.service.mock.ts b/openvidu-components-angular/projects/openvidu-angular/src/lib/services/config/openvidu-angular.config.service.mock.ts new file mode 100644 index 00000000..0b4bd4a4 --- /dev/null +++ b/openvidu-components-angular/projects/openvidu-angular/src/lib/services/config/openvidu-angular.config.service.mock.ts @@ -0,0 +1,19 @@ +import { Injectable } from '@angular/core'; +import { OpenViduAngularConfig } from '../../config/openvidu-angular.config'; + +@Injectable() +export class OpenViduAngularConfigServiceMock { + + private configuration: OpenViduAngularConfig; + + constructor() { + this.configuration = {production: false}; + } + + getConfig(): OpenViduAngularConfig { + return this.configuration; + } + isProduction(): boolean { + return this.configuration?.production; + } +} diff --git a/openvidu-components-angular/projects/openvidu-angular/src/lib/services/config/openvidu-angular.config.service.spec.ts b/openvidu-components-angular/projects/openvidu-angular/src/lib/services/config/openvidu-angular.config.service.spec.ts new file mode 100644 index 00000000..447a1f64 --- /dev/null +++ b/openvidu-components-angular/projects/openvidu-angular/src/lib/services/config/openvidu-angular.config.service.spec.ts @@ -0,0 +1,22 @@ +import { TestBed } from '@angular/core/testing'; +import { OpenViduAngularConfig } from '../../config/openvidu-angular.config'; + +import { OpenViduAngularConfigService } from './openvidu-angular.config.service'; + +describe('OpenViduAngularConfigService', () => { + let service: OpenViduAngularConfigService; + const config: OpenViduAngularConfig = { production: false }; + + beforeEach(() => { + TestBed.configureTestingModule({ + providers: [ + OpenViduAngularConfigService, + {provide: 'LIB_CONFIG', useValue: config}] + }); + service = TestBed.inject(OpenViduAngularConfigService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); +}); 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/config/openvidu-angular.config.service.ts similarity index 65% rename from openvidu-components-angular/projects/openvidu-angular/src/lib/services/library-config/library-config.service.ts rename to openvidu-components-angular/projects/openvidu-angular/src/lib/services/config/openvidu-angular.config.service.ts index e6885b2d..e34cb9e7 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/config/openvidu-angular.config.service.ts @@ -1,20 +1,20 @@ import { Inject, Injectable } from '@angular/core'; -import { LibConfig, ParticipantFactoryFunction } from '../../config/lib.config'; +import { OpenViduAngularConfig, ParticipantFactoryFunction } from '../../config/openvidu-angular.config'; // import { version } from '../../../../package.json'; @Injectable() -export class LibraryConfigService { - private configuration: LibConfig; +export class OpenViduAngularConfigService { + private configuration: OpenViduAngularConfig; - constructor(@Inject('LIB_CONFIG') config: LibConfig) { + constructor(@Inject('OPENVIDU_ANGULAR_CONFIG') config: OpenViduAngularConfig) { this.configuration = config; console.log(this.configuration); if(this.isProduction()) console.log('OpenVidu Angular Production Mode'); // console.log(version) } - getConfig(): LibConfig { + getConfig(): OpenViduAngularConfig { return this.configuration; } isProduction(): boolean { diff --git a/openvidu-components-angular/projects/openvidu-angular/src/lib/services/library-config/library-config.service.mock.ts b/openvidu-components-angular/projects/openvidu-angular/src/lib/services/library-config/library-config.service.mock.ts deleted file mode 100644 index 4f6ff589..00000000 --- a/openvidu-components-angular/projects/openvidu-angular/src/lib/services/library-config/library-config.service.mock.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { Injectable } from '@angular/core'; -import { LibConfig } from '../../config/lib.config'; - -@Injectable() -export class LibraryConfigServiceMock { - - private configuration: LibConfig; - - constructor() { - this.configuration = {environment: {production: false}}; - } - - getConfig(): LibConfig { - return this.configuration; - } - isProduction(): boolean { - return this.configuration?.environment?.production; - } -} diff --git a/openvidu-components-angular/projects/openvidu-angular/src/lib/services/library-config/library-config.service.spec.ts b/openvidu-components-angular/projects/openvidu-angular/src/lib/services/library-config/library-config.service.spec.ts deleted file mode 100644 index 6cc3db1e..00000000 --- a/openvidu-components-angular/projects/openvidu-angular/src/lib/services/library-config/library-config.service.spec.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { TestBed } from '@angular/core/testing'; -import { LibConfig } from '../../config/lib.config'; - -import { LibraryConfigService } from './library-config.service'; - -describe('LibraryConfigService', () => { - let service: LibraryConfigService; - const libConfig: LibConfig = { environment: {production: false} }; - - beforeEach(() => { - TestBed.configureTestingModule({ - providers: [ - LibraryConfigService, - {provide: 'LIB_CONFIG', useValue: libConfig}] - }); - service = TestBed.inject(LibraryConfigService); - }); - - it('should be created', () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/openvidu-components-angular/projects/openvidu-angular/src/lib/services/logger/logger.service.ts b/openvidu-components-angular/projects/openvidu-angular/src/lib/services/logger/logger.service.ts index 73201426..0720a34b 100644 --- a/openvidu-components-angular/projects/openvidu-angular/src/lib/services/logger/logger.service.ts +++ b/openvidu-components-angular/projects/openvidu-angular/src/lib/services/logger/logger.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; import { ILogService } from '../../models/logger.model'; -import { LibraryConfigService } from '../library-config/library-config.service'; +import { OpenViduAngularConfigService } from '../config/openvidu-angular.config.service'; @Injectable({ providedIn: 'root' @@ -15,7 +15,7 @@ export class LoggerService implements ILogService { ['[', '] ERROR: '] ]; - constructor(private libraryConfigSrv: LibraryConfigService) { + constructor(private openviduAngularConfigSrv: OpenViduAngularConfigService) { } private getLoggerFns(prefix: string) { @@ -28,7 +28,7 @@ export class LoggerService implements ILogService { } public get(prefix: string) { - const prodMode = this.libraryConfigSrv.isProduction(); + const prodMode = this.openviduAngularConfigSrv.isProduction(); const loggerService = this; return { d: function(...args: any[]) { diff --git a/openvidu-components-angular/projects/openvidu-angular/src/lib/services/openvidu/openvidu.service.ts b/openvidu-components-angular/projects/openvidu-angular/src/lib/services/openvidu/openvidu.service.ts index 9704a8a6..92dc00b1 100644 --- a/openvidu-components-angular/projects/openvidu-angular/src/lib/services/openvidu/openvidu.service.ts +++ b/openvidu-components-angular/projects/openvidu-angular/src/lib/services/openvidu/openvidu.service.ts @@ -5,7 +5,7 @@ import { LoggerService } from '../logger/logger.service'; import { ILogger } from '../../models/logger.model'; import { Signal } from '../../models/signal.model'; -import { LibraryConfigService } from '../library-config/library-config.service'; +import { OpenViduAngularConfigService } from '../config/openvidu-angular.config.service'; import { PlatformService } from '../platform/platform.service'; import { DeviceService } from '../device/device.service'; import { CameraType } from '../../models/device.model'; @@ -27,7 +27,7 @@ export class OpenViduService { protected log: ILogger; constructor( - protected libraryConfigSrv: LibraryConfigService, + protected openviduAngularConfigSrv: OpenViduAngularConfigService, protected platformService: PlatformService, protected loggerSrv: LoggerService, private participantService: ParticipantService, @@ -38,13 +38,13 @@ export class OpenViduService { initialize() { this.OV = new OpenVidu(); - if (this.libraryConfigSrv.isProduction()) this.OV.enableProdMode(); + if (this.openviduAngularConfigSrv.isProduction()) this.OV.enableProdMode(); this.webcamSession = this.OV.initSession(); // Initialize screen session only if it is not mobile platform if (!this.platformService.isMobile()) { this.OVScreen = new OpenVidu(); - if (this.libraryConfigSrv.isProduction()) this.OVScreen.enableProdMode(); + if (this.openviduAngularConfigSrv.isProduction()) this.OVScreen.enableProdMode(); this.screenSession = this.OVScreen.initSession(); } } 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 a3a4e722..2d1b976f 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,7 +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 { OpenViduAngularConfigService } from '../config/openvidu-angular.config.service'; import { LoggerService } from '../logger/logger.service'; @Injectable({ @@ -30,7 +30,7 @@ export class ParticipantService { protected log: ILogger; - constructor(protected libraryConfigSrv: LibraryConfigService, protected loggerSrv: LoggerService) { + constructor(protected openviduAngularConfigSrv: OpenViduAngularConfigService, protected loggerSrv: LoggerService) { this.log = this.loggerSrv.get('ParticipantService'); this.localParticipantObs = this._localParticipant.asObservable(); @@ -305,8 +305,8 @@ export class ParticipantService { } protected newParticipant(streamModel?: StreamModel, participantId?: string) { - if(this.libraryConfigSrv.hasParticipantFactory()){ - return this.libraryConfigSrv.getParticipantFactory().apply(this, [streamModel, participantId]); + if(this.openviduAngularConfigSrv.hasParticipantFactory()){ + return this.openviduAngularConfigSrv.getParticipantFactory().apply(this, [streamModel, participantId]); } return new ParticipantModel(streamModel, participantId); } diff --git a/openvidu-components-angular/projects/openvidu-angular/src/public-api.ts b/openvidu-components-angular/projects/openvidu-angular/src/public-api.ts index c5316f69..d6ac2a26 100644 --- a/openvidu-components-angular/projects/openvidu-angular/src/public-api.ts +++ b/openvidu-components-angular/projects/openvidu-angular/src/public-api.ts @@ -10,7 +10,7 @@ export * from './lib/services/participant/participant.service'; export * from './lib/services/chat/chat.service'; export * from './lib/services/platform/platform.service'; export * from './lib/services/logger/logger.service'; -export * from './lib/services/library-config/library-config.service'; +export * from './lib/services/config/openvidu-angular.config.service'; export * from './lib/services/document/document.service'; export * from './lib/services/token/token.service'; export * from './lib/services/device/device.service'; @@ -34,7 +34,7 @@ export * from './lib/components/audio-wave/audio-wave.component'; // Models export * from './lib/models/participant.model'; -export * from './lib/config/lib.config'; +export * from './lib/config/openvidu-angular.config'; export * from './lib/models/logger.model'; export * from './lib/models/video-type.model'; export * from './lib/models/notification-options.model'; diff --git a/openvidu-components-angular/src/app/app.module.ts b/openvidu-components-angular/src/app/app.module.ts index d516e1b2..102c74cf 100644 --- a/openvidu-components-angular/src/app/app.module.ts +++ b/openvidu-components-angular/src/app/app.module.ts @@ -17,7 +17,7 @@ import { LayoutTestComponent } from './components/layout-test/layout-test.compon import { StreamTestComponent } from './components/stream-test/stream-test.component'; import { - OpenviduAngularModule, + OpenViduAngularModule, UserSettingsComponent, ChatPanelComponent, ToolbarComponent, @@ -41,7 +41,7 @@ import { MatButtonModule } from '@angular/material/button'; BrowserModule, MatButtonModule, BrowserAnimationsModule, - OpenviduAngularModule.forRoot(environment), + OpenViduAngularModule.forRoot(environment), AppRoutingModule // Order is important, AppRoutingModule must be the last import for useHash working ], providers: [VideoconferenceComponent, UserSettingsComponent, ToolbarComponent, ChatPanelComponent, SessionComponent, LayoutComponent],