diff --git a/openvidu-server/pom.xml b/openvidu-server/pom.xml index 821e54e5..70d01ff0 100644 --- a/openvidu-server/pom.xml +++ b/openvidu-server/pom.xml @@ -56,6 +56,9 @@ src/main/resources false + + frontend/** + src/main/resources diff --git a/openvidu-server/src/main/java/org/openvidu/server/InfoHandler.java b/openvidu-server/src/main/java/org/openvidu/server/InfoHandler.java new file mode 100644 index 00000000..4f962e3f --- /dev/null +++ b/openvidu-server/src/main/java/org/openvidu/server/InfoHandler.java @@ -0,0 +1,49 @@ +package org.openvidu.server; + +import java.io.IOException; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.Semaphore; + +import org.springframework.web.socket.CloseStatus; +import org.springframework.web.socket.TextMessage; +import org.springframework.web.socket.WebSocketSession; +import org.springframework.web.socket.handler.TextWebSocketHandler; + +public class InfoHandler extends TextWebSocketHandler { + + Map sessions = new ConcurrentHashMap<>(); + Semaphore semaphore = new Semaphore(1); + + public void sendInfo(String info){ + for (WebSocketSession session : this.sessions.values()) { + try { + this.semaphore.acquire(); + session.sendMessage(new TextMessage(info)); + this.semaphore.release(); + } catch (IOException | InterruptedException e) { + e.printStackTrace(); + } + } + } + + @Override + public void afterConnectionEstablished(WebSocketSession session) throws Exception { + System.out.println("Info websocket stablished..."); + this.sessions.put(session.getId(), session); + } + + @Override + public void afterConnectionClosed(WebSocketSession session, CloseStatus close) throws Exception { + System.out.println("Info websocket closed: " + close.getReason()); + this.sessions.remove(session.getId()); + session.close(); + } + + @Override + protected void handleTextMessage(WebSocketSession session, TextMessage message) + throws Exception { + System.out.println("Message received: " + message.getPayload()); + } + +} diff --git a/openvidu-server/src/main/java/org/openvidu/server/InfoSocketConfig.java b/openvidu-server/src/main/java/org/openvidu/server/InfoSocketConfig.java new file mode 100644 index 00000000..db433735 --- /dev/null +++ b/openvidu-server/src/main/java/org/openvidu/server/InfoSocketConfig.java @@ -0,0 +1,24 @@ +package org.openvidu.server; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.socket.config.annotation.EnableWebSocket; +import org.springframework.web.socket.config.annotation.WebSocketConfigurer; +import org.springframework.web.socket.config.annotation.WebSocketHandlerRegistry; + +@Configuration +@EnableWebSocket +public class InfoSocketConfig implements WebSocketConfigurer { + + @Override + public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) { + registry.addHandler(infoHandler(), "/info"); + //.setAllowedOrigins("*"); + } + + @Bean + public InfoHandler infoHandler() { + return new InfoHandler(); + } + +} diff --git a/openvidu-server/src/main/java/org/openvidu/server/OpenViduServer.java b/openvidu-server/src/main/java/org/openvidu/server/OpenViduServer.java index 1818758d..82bb1a44 100644 --- a/openvidu-server/src/main/java/org/openvidu/server/OpenViduServer.java +++ b/openvidu-server/src/main/java/org/openvidu/server/OpenViduServer.java @@ -53,7 +53,7 @@ import com.google.gson.JsonArray; * @author Radu Tom Vlad (rvlad@naevatec.com) * @since 1.0.0 */ -@Import(JsonRpcConfiguration.class) +@Import({JsonRpcConfiguration.class, InfoSocketConfig.class}) @SpringBootApplication public class OpenViduServer implements JsonRpcConfigurer { diff --git a/openvidu-server/src/main/java/org/openvidu/server/core/RoomManager.java b/openvidu-server/src/main/java/org/openvidu/server/core/RoomManager.java index 988dd76e..5c450e06 100644 --- a/openvidu-server/src/main/java/org/openvidu/server/core/RoomManager.java +++ b/openvidu-server/src/main/java/org/openvidu/server/core/RoomManager.java @@ -36,6 +36,7 @@ import org.kurento.client.RtpEndpoint; import org.kurento.client.WebRtcEndpoint; import org.openvidu.client.OpenViduException; import org.openvidu.client.OpenViduException.Code; +import org.openvidu.server.InfoHandler; import org.openvidu.server.core.api.KurentoClientProvider; import org.openvidu.server.core.api.KurentoClientSessionInfo; import org.openvidu.server.core.api.MutedMediaType; @@ -825,6 +826,9 @@ public class RoomManager { } log.warn("No room '{}' exists yet. Created one " + "using KurentoClient '{}'.", roomName, kcName); + + this.roomHandler.getInfoHandler().sendInfo("New room " + roomName); + } /** diff --git a/openvidu-server/src/main/java/org/openvidu/server/core/api/RoomHandler.java b/openvidu-server/src/main/java/org/openvidu/server/core/api/RoomHandler.java index 5247b2ae..f91e7d6b 100644 --- a/openvidu-server/src/main/java/org/openvidu/server/core/api/RoomHandler.java +++ b/openvidu-server/src/main/java/org/openvidu/server/core/api/RoomHandler.java @@ -19,6 +19,7 @@ package org.openvidu.server.core.api; import java.util.Set; import org.kurento.client.IceCandidate; +import org.openvidu.server.InfoHandler; import org.openvidu.server.core.internal.Participant; /** @@ -79,4 +80,7 @@ public interface RoomHandler { * @return Then new state of the filter */ String getNextFilterState(String filterId, String state); + + InfoHandler getInfoHandler(); + } diff --git a/openvidu-server/src/main/java/org/openvidu/server/core/endpoint/MediaEndpoint.java b/openvidu-server/src/main/java/org/openvidu/server/core/endpoint/MediaEndpoint.java index 4dd3cd57..7593e309 100644 --- a/openvidu-server/src/main/java/org/openvidu/server/core/endpoint/MediaEndpoint.java +++ b/openvidu-server/src/main/java/org/openvidu/server/core/endpoint/MediaEndpoint.java @@ -17,6 +17,8 @@ package org.openvidu.server.core.endpoint; import java.util.LinkedList; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.CountDownLatch; import org.kurento.client.Continuation; @@ -25,6 +27,7 @@ import org.kurento.client.EventListener; import org.kurento.client.IceCandidate; import org.kurento.client.ListenerSubscription; import org.kurento.client.MediaElement; +import org.kurento.client.MediaObject; import org.kurento.client.MediaPipeline; import org.kurento.client.OnIceCandidateEvent; import org.kurento.client.RtpEndpoint; @@ -62,6 +65,9 @@ public abstract class MediaEndpoint { private LinkedList candidates = new LinkedList(); private MutedMediaType muteType; + + public Map flowInMedia = new ConcurrentHashMap<>(); + public Map flowOutMedia = new ConcurrentHashMap<>(); /** * Constructor to set the owner, the endpoint's name and the media pipeline. diff --git a/openvidu-server/src/main/java/org/openvidu/server/core/internal/DefaultNotificationRoomHandler.java b/openvidu-server/src/main/java/org/openvidu/server/core/internal/DefaultNotificationRoomHandler.java index 870c26e3..3cfaa20a 100644 --- a/openvidu-server/src/main/java/org/openvidu/server/core/internal/DefaultNotificationRoomHandler.java +++ b/openvidu-server/src/main/java/org/openvidu/server/core/internal/DefaultNotificationRoomHandler.java @@ -21,10 +21,12 @@ import java.util.Set; import org.kurento.client.IceCandidate; import org.openvidu.client.OpenViduException; import org.openvidu.client.internal.ProtocolElements; +import org.openvidu.server.InfoHandler; import org.openvidu.server.core.api.NotificationRoomHandler; import org.openvidu.server.core.api.UserNotificationService; import org.openvidu.server.core.api.pojo.ParticipantRequest; import org.openvidu.server.core.api.pojo.UserParticipant; +import org.springframework.beans.factory.annotation.Autowired; import com.google.gson.JsonArray; import com.google.gson.JsonObject; @@ -38,6 +40,9 @@ import com.google.gson.JsonObject; public class DefaultNotificationRoomHandler implements NotificationRoomHandler { private UserNotificationService notifService; + + @Autowired + private InfoHandler infoHandler; public DefaultNotificationRoomHandler(UserNotificationService notifService) { this.notifService = notifService; @@ -275,4 +280,9 @@ public class DefaultNotificationRoomHandler implements NotificationRoomHandler { public String getNextFilterState(String filterId, String state) { return null; } + + @Override + public InfoHandler getInfoHandler(){ + return this.infoHandler; + } } diff --git a/openvidu-server/src/main/java/org/openvidu/server/core/internal/Participant.java b/openvidu-server/src/main/java/org/openvidu/server/core/internal/Participant.java index ee9f13d7..34395056 100644 --- a/openvidu-server/src/main/java/org/openvidu/server/core/internal/Participant.java +++ b/openvidu-server/src/main/java/org/openvidu/server/core/internal/Participant.java @@ -34,7 +34,9 @@ import org.kurento.client.SdpEndpoint; import org.kurento.client.internal.server.KurentoServerException; import org.openvidu.client.OpenViduException; import org.openvidu.client.OpenViduException.Code; +import org.openvidu.server.InfoHandler; import org.openvidu.server.core.api.MutedMediaType; +import org.openvidu.server.core.endpoint.MediaEndpoint; import org.openvidu.server.core.endpoint.PublisherEndpoint; import org.openvidu.server.core.endpoint.SdpType; import org.openvidu.server.core.endpoint.SubscriberEndpoint; @@ -72,9 +74,11 @@ public class Participant { private volatile boolean streaming = false; private volatile boolean closed; + + private InfoHandler infoHandler; public Participant(String id, String name, String clientMetadata, String serverMetadata, Room room, MediaPipeline pipeline, - boolean dataChannels, boolean web) { + boolean dataChannels, boolean web, InfoHandler infoHandler) { this.id = id; this.name = name; this.clientMetadata = clientMetadata; @@ -84,7 +88,9 @@ public class Participant { this.pipeline = pipeline; this.room = room; this.publisher = new PublisherEndpoint(web, dataChannels, this, name, pipeline); - + + this.infoHandler = infoHandler; + for (Participant other : room.getParticipants()) { if (!other.getName().equals(this.name)) { getNewOrExistingSubscriber(other.getName()); @@ -98,6 +104,8 @@ public class Participant { throw new OpenViduException(Code.MEDIA_ENDPOINT_ERROR_CODE, "Unable to create publisher endpoint"); } + this.publisher.getEndpoint().addTag("name", "PUBLISHER " + this.name); + addEndpointListeners(this.publisher); } public String getId() { @@ -305,6 +313,10 @@ public class Participant { throw new OpenViduException(Code.MEDIA_ENDPOINT_ERROR_CODE, "Unable to create subscriber endpoint"); } + + subscriber.getEndpoint().addTag("name", "SUBSCRIBER " + senderName + " for user " + this.name); + addEndpointListeners(subscriber); + } catch (OpenViduException e) { this.subscribers.remove(senderName); throw e; @@ -545,4 +557,92 @@ public class Participant { } return true; } + + private void addEndpointListeners(MediaEndpoint endpoint) { + + endpoint.getEndpoint().addElementConnectedListener((element) -> { + String msg = " Element connected (" + endpoint.getEndpoint().getTag("name") + ") -> " + + "SINK: " + element.getSink().getName() + + " | SOURCE: " + element.getSource().getName() + + " | MEDIATYPE: " + element.getMediaType(); + System.out.println(msg); + this.infoHandler.sendInfo(msg); + }); + + /*endpoint.getEndpoint().addElementDisconnectedListener((event) -> { + String msg = " Element disconnected (" + endpoint.getEndpoint().getTag("name") + ") -> " + + "SINK: " + event.getSinkMediaDescription() + + " | SOURCE: " + event.getSourceMediaDescription() + + " | MEDIATYPE: " + event.getMediaType(); + System.out.println(msg); + this.infoHandler.sendInfo(msg); + });*/ + + endpoint.getEndpoint().addErrorListener((event) -> { + String msg = " Error (PUBLISHER) -> " + + "ERRORCODE: " + event.getErrorCode() + + " | DESCRIPTION: " + event.getDescription(); + System.out.println(msg); + this.infoHandler.sendInfo(msg); + }); + + endpoint.getEndpoint().addMediaFlowInStateChangeListener((event) -> { + String msg1 = " Media flow in state change (" + endpoint.getEndpoint().getTag("name") + ") -> " + + "STATE: " + event.getState() + + " | SOURCE: " + event.getSource().getName() + + " | PAD: " + event.getPadName() + + " | MEDIATYPE: " + event.getMediaType(); + + endpoint.flowInMedia.put(event.getSource().getName()+"/"+event.getMediaType(), event.getSource()); + + String msg2; + + if (endpoint.flowInMedia.values().size() != 2){ + msg2 = " THERE ARE LESS FLOW IN MEDIA'S THAN EXPECTED IN " + endpoint.getEndpoint().getTag("name") + " (" + endpoint.flowInMedia.values().size() + ")"; + } else { + msg2 = " NUMBER OF FLOW IN MEDIA'S IS NOW CORRECT IN " + endpoint.getEndpoint().getTag("name") + " (" + endpoint.flowInMedia.values().size() + ")"; + } + + System.out.println(msg1); + System.out.println(msg2); + this.infoHandler.sendInfo(msg1); + this.infoHandler.sendInfo(msg2); + }); + + endpoint.getEndpoint().addMediaFlowOutStateChangeListener((event) -> { + String msg1 = " Media flow out state change (" + endpoint.getEndpoint().getTag("name") + ") -> " + + "STATE: " + event.getState() + + " | SOURCE: " + event.getSource().getName() + + " | PAD: " + event.getPadName() + + " | MEDIATYPE: " + event.getMediaType(); + + endpoint.flowOutMedia.put(event.getSource().getName()+"/"+event.getMediaType(), event.getSource()); + + String msg2; + + if (endpoint.flowOutMedia.values().size() != 2){ + msg2 = " THERE ARE LESS FLOW OUT MEDIA'S THAN EXPECTED IN " + endpoint.getEndpoint().getTag("name") + " (" + endpoint.flowOutMedia.values().size() + ")"; + } else { + msg2 = " NUMBER OF FLOW OUT MEDIA'S IS NOW CORRECT IN " + endpoint.getEndpoint().getTag("name") + " (" + endpoint.flowOutMedia.values().size() + ")"; + } + + System.out.println(msg1); + System.out.println(msg2); + this.infoHandler.sendInfo(msg1); + this.infoHandler.sendInfo(msg2); + }); + + endpoint.getEndpoint().addMediaSessionStartedListener((event) -> { + String msg = " Media session started (" + endpoint.getEndpoint().getTag("name") + ")"; + System.out.println(msg); + this.infoHandler.sendInfo(msg); + }); + + endpoint.getEndpoint().addMediaSessionTerminatedListener((event) -> { + String msg = " Media session terminated (" + endpoint.getEndpoint().getTag("name") + ")"; + System.out.println(msg); + this.infoHandler.sendInfo(msg); + }); + } + } diff --git a/openvidu-server/src/main/java/org/openvidu/server/core/internal/Room.java b/openvidu-server/src/main/java/org/openvidu/server/core/internal/Room.java index 69ed2913..90ee1c6f 100644 --- a/openvidu-server/src/main/java/org/openvidu/server/core/internal/Room.java +++ b/openvidu-server/src/main/java/org/openvidu/server/core/internal/Room.java @@ -32,6 +32,7 @@ import org.kurento.client.KurentoClient; import org.kurento.client.MediaPipeline; import org.openvidu.client.OpenViduException; import org.openvidu.client.OpenViduException.Code; +import org.openvidu.server.InfoHandler; import org.openvidu.server.core.api.RoomHandler; import org.openvidu.server.core.api.pojo.UserParticipant; import org.slf4j.Logger; @@ -110,7 +111,7 @@ public class Room { createPipeline(); Participant p = - new Participant(participantId, user, clientMetadata, serverMetadata, this, getPipeline(), dataChannels, webParticipant); + new Participant(participantId, user, clientMetadata, serverMetadata, this, getPipeline(), dataChannels, webParticipant, this.roomHandler.getInfoHandler()); participants.put(participantId, p); filterStates.forEach((filterId, state) -> { @@ -348,4 +349,8 @@ public class Room { roomHandler.updateFilter(getName(), participant, filterId, newState); } } + + public InfoHandler getInfoHandler() { + return this.roomHandler.getInfoHandler(); + } } diff --git a/openvidu-server/src/main/java/org/openvidu/server/security/SecurityConfig.java b/openvidu-server/src/main/java/org/openvidu/server/security/SecurityConfig.java index 66336e7a..b04c3005 100644 --- a/openvidu-server/src/main/java/org/openvidu/server/security/SecurityConfig.java +++ b/openvidu-server/src/main/java/org/openvidu/server/security/SecurityConfig.java @@ -39,6 +39,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { .authorizeRequests() .antMatchers(HttpMethod.GET, "/getSessionId").authenticated() .antMatchers(HttpMethod.POST, "/newToken").authenticated() + .antMatchers("/").authenticated() .and().sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS); } diff --git a/openvidu-server/src/main/resources/BuildFrontJarAndRun.sh b/openvidu-server/src/main/resources/BuildFrontJarAndRun.sh new file mode 100755 index 00000000..c2d95682 --- /dev/null +++ b/openvidu-server/src/main/resources/BuildFrontJarAndRun.sh @@ -0,0 +1,6 @@ +#!/bin/sh +cd frontend +ng build --output-path ../static +cd ../../../../ +mvn -DskipTests=true clean package +java -jar target/openvidu-server-0.0.1-SNAPSHOT.jar diff --git a/openvidu-server/src/main/resources/frontend/.angular-cli.json b/openvidu-server/src/main/resources/frontend/.angular-cli.json new file mode 100644 index 00000000..0e144dd1 --- /dev/null +++ b/openvidu-server/src/main/resources/frontend/.angular-cli.json @@ -0,0 +1,57 @@ +{ + "$schema": "./node_modules/@angular/cli/lib/config/schema.json", + "project": { + "name": "openvidu-server-frontend" + }, + "apps": [ + { + "root": "src", + "outDir": "dist", + "assets": [ + "assets", + "favicon.ico" + ], + "index": "index.html", + "main": "main.ts", + "polyfills": "polyfills.ts", + "test": "test.ts", + "tsconfig": "tsconfig.app.json", + "testTsconfig": "tsconfig.spec.json", + "prefix": "app", + "styles": [ + "styles.css" + ], + "scripts": [], + "environmentSource": "environments/environment.ts", + "environments": { + "dev": "environments/environment.ts", + "prod": "environments/environment.prod.ts" + } + } + ], + "e2e": { + "protractor": { + "config": "./protractor.conf.js" + } + }, + "lint": [ + { + "project": "src/tsconfig.app.json" + }, + { + "project": "src/tsconfig.spec.json" + }, + { + "project": "e2e/tsconfig.e2e.json" + } + ], + "test": { + "karma": { + "config": "./karma.conf.js" + } + }, + "defaults": { + "styleExt": "css", + "component": {} + } +} diff --git a/openvidu-server/src/main/resources/frontend/.editorconfig b/openvidu-server/src/main/resources/frontend/.editorconfig new file mode 100644 index 00000000..6e87a003 --- /dev/null +++ b/openvidu-server/src/main/resources/frontend/.editorconfig @@ -0,0 +1,13 @@ +# Editor configuration, see http://editorconfig.org +root = true + +[*] +charset = utf-8 +indent_style = space +indent_size = 2 +insert_final_newline = true +trim_trailing_whitespace = true + +[*.md] +max_line_length = off +trim_trailing_whitespace = false diff --git a/openvidu-server/src/main/resources/frontend/.gitignore b/openvidu-server/src/main/resources/frontend/.gitignore new file mode 100644 index 00000000..54bfd200 --- /dev/null +++ b/openvidu-server/src/main/resources/frontend/.gitignore @@ -0,0 +1,42 @@ +# See http://help.github.com/ignore-files/ for more about ignoring files. + +# compiled output +/dist +/tmp +/out-tsc + +# dependencies +/node_modules + +# IDEs and editors +/.idea +.project +.classpath +.c9/ +*.launch +.settings/ +*.sublime-workspace + +# IDE - VSCode +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json + +# misc +/.sass-cache +/connect.lock +/coverage +/libpeerconnection.log +npm-debug.log +testem.log +/typings + +# e2e +/e2e/*.js +/e2e/*.map + +# System Files +.DS_Store +Thumbs.db diff --git a/openvidu-server/src/main/resources/frontend/README.md b/openvidu-server/src/main/resources/frontend/README.md new file mode 100644 index 00000000..ea77dddd --- /dev/null +++ b/openvidu-server/src/main/resources/frontend/README.md @@ -0,0 +1,28 @@ +# Frontend + +This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 1.0.2. + +## Development server + +Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files. + +## Code scaffolding + +Run `ng generate component component-name` to generate a new component. You can also use `ng generate directive|pipe|service|class|module`. + +## Build + +Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory. Use the `-prod` flag for a production build. + +## Running unit tests + +Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.io). + +## Running end-to-end tests + +Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protractortest.org/). +Before running the tests make sure you are serving the app via `ng serve`. + +## Further help + +To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/README.md). diff --git a/openvidu-server/src/main/resources/frontend/e2e/app.e2e-spec.ts b/openvidu-server/src/main/resources/frontend/e2e/app.e2e-spec.ts new file mode 100644 index 00000000..b776c76e --- /dev/null +++ b/openvidu-server/src/main/resources/frontend/e2e/app.e2e-spec.ts @@ -0,0 +1,14 @@ +import { FrontendPage } from './app.po'; + +describe('frontend App', () => { + let page: FrontendPage; + + beforeEach(() => { + page = new FrontendPage(); + }); + + it('should display message saying app works', () => { + page.navigateTo(); + expect(page.getParagraphText()).toEqual('app works!'); + }); +}); diff --git a/openvidu-server/src/main/resources/frontend/e2e/app.po.ts b/openvidu-server/src/main/resources/frontend/e2e/app.po.ts new file mode 100644 index 00000000..6991fd44 --- /dev/null +++ b/openvidu-server/src/main/resources/frontend/e2e/app.po.ts @@ -0,0 +1,11 @@ +import { browser, element, by } from 'protractor'; + +export class FrontendPage { + navigateTo() { + return browser.get('/'); + } + + getParagraphText() { + return element(by.css('app-root h1')).getText(); + } +} diff --git a/openvidu-server/src/main/resources/frontend/e2e/tsconfig.e2e.json b/openvidu-server/src/main/resources/frontend/e2e/tsconfig.e2e.json new file mode 100644 index 00000000..ac7a3732 --- /dev/null +++ b/openvidu-server/src/main/resources/frontend/e2e/tsconfig.e2e.json @@ -0,0 +1,12 @@ +{ + "extends": "../tsconfig.json", + "compilerOptions": { + "outDir": "../out-tsc/e2e", + "module": "commonjs", + "target": "es5", + "types":[ + "jasmine", + "node" + ] + } +} diff --git a/openvidu-server/src/main/resources/frontend/karma.conf.js b/openvidu-server/src/main/resources/frontend/karma.conf.js new file mode 100644 index 00000000..84b4cd5a --- /dev/null +++ b/openvidu-server/src/main/resources/frontend/karma.conf.js @@ -0,0 +1,44 @@ +// Karma configuration file, see link for more information +// https://karma-runner.github.io/0.13/config/configuration-file.html + +module.exports = function (config) { + config.set({ + basePath: '', + frameworks: ['jasmine', '@angular/cli'], + plugins: [ + require('karma-jasmine'), + require('karma-chrome-launcher'), + require('karma-jasmine-html-reporter'), + require('karma-coverage-istanbul-reporter'), + require('@angular/cli/plugins/karma') + ], + client:{ + clearContext: false // leave Jasmine Spec Runner output visible in browser + }, + files: [ + { pattern: './src/test.ts', watched: false } + ], + preprocessors: { + './src/test.ts': ['@angular/cli'] + }, + mime: { + 'text/x-typescript': ['ts','tsx'] + }, + coverageIstanbulReporter: { + reports: [ 'html', 'lcovonly' ], + fixWebpackSourcePaths: true + }, + angularCli: { + environment: 'dev' + }, + reporters: config.angularCli && config.angularCli.codeCoverage + ? ['progress', 'coverage-istanbul'] + : ['progress', 'kjhtml'], + port: 9876, + colors: true, + logLevel: config.LOG_INFO, + autoWatch: true, + browsers: ['Chrome'], + singleRun: false + }); +}; diff --git a/openvidu-server/src/main/resources/frontend/package.json b/openvidu-server/src/main/resources/frontend/package.json new file mode 100644 index 00000000..8ee75fcb --- /dev/null +++ b/openvidu-server/src/main/resources/frontend/package.json @@ -0,0 +1,50 @@ +{ + "name": "frontend", + "version": "0.0.0", + "license": "MIT", + "scripts": { + "ng": "ng", + "start": "ng serve", + "build": "ng build", + "test": "ng test", + "lint": "ng lint", + "e2e": "ng e2e" + }, + "private": true, + "dependencies": { + "@angular/animations": "^4.1.3", + "@angular/common": "^4.0.0", + "@angular/compiler": "^4.0.0", + "@angular/core": "^4.0.0", + "@angular/flex-layout": "^2.0.0-beta.8", + "@angular/forms": "^4.0.0", + "@angular/http": "^4.0.0", + "@angular/material": "2.0.0-beta.5", + "@angular/platform-browser": "^4.0.0", + "@angular/platform-browser-dynamic": "^4.0.0", + "@angular/router": "^4.0.0", + "core-js": "^2.4.1", + "hammerjs": "^2.0.8", + "rxjs": "^5.1.0", + "zone.js": "^0.8.4" + }, + "devDependencies": { + "@angular/cli": "1.0.2", + "@angular/compiler-cli": "^4.0.0", + "@types/jasmine": "2.5.38", + "@types/node": "~6.0.60", + "codelyzer": "^3.0.1", + "jasmine-core": "~2.5.2", + "jasmine-spec-reporter": "~3.2.0", + "karma": "~1.4.1", + "karma-chrome-launcher": "~2.0.0", + "karma-cli": "~1.0.1", + "karma-jasmine": "~1.1.0", + "karma-jasmine-html-reporter": "^0.2.2", + "karma-coverage-istanbul-reporter": "^0.2.0", + "protractor": "~5.1.0", + "ts-node": "~2.0.0", + "tslint": "^5.1.0", + "typescript": "~2.3.3" + } +} diff --git a/openvidu-server/src/main/resources/frontend/protractor.conf.js b/openvidu-server/src/main/resources/frontend/protractor.conf.js new file mode 100644 index 00000000..1c5e1e5a --- /dev/null +++ b/openvidu-server/src/main/resources/frontend/protractor.conf.js @@ -0,0 +1,30 @@ +// Protractor configuration file, see link for more information +// https://github.com/angular/protractor/blob/master/lib/config.ts + +const { SpecReporter } = require('jasmine-spec-reporter'); + +exports.config = { + allScriptsTimeout: 11000, + specs: [ + './e2e/**/*.e2e-spec.ts' + ], + capabilities: { + 'browserName': 'chrome' + }, + directConnect: true, + baseUrl: 'http://localhost:4200/', + framework: 'jasmine', + jasmineNodeOpts: { + showColors: true, + defaultTimeoutInterval: 30000, + print: function() {} + }, + beforeLaunch: function() { + require('ts-node').register({ + project: 'e2e/tsconfig.e2e.json' + }); + }, + onPrepare() { + jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } })); + } +}; diff --git a/openvidu-server/src/main/resources/frontend/src/app/app.component.css b/openvidu-server/src/main/resources/frontend/src/app/app.component.css new file mode 100644 index 00000000..e69de29b diff --git a/openvidu-server/src/main/resources/frontend/src/app/app.component.html b/openvidu-server/src/main/resources/frontend/src/app/app.component.html new file mode 100644 index 00000000..81080729 --- /dev/null +++ b/openvidu-server/src/main/resources/frontend/src/app/app.component.html @@ -0,0 +1,3 @@ +
+ +
\ No newline at end of file diff --git a/openvidu-server/src/main/resources/frontend/src/app/app.component.spec.ts b/openvidu-server/src/main/resources/frontend/src/app/app.component.spec.ts new file mode 100644 index 00000000..c740bcd7 --- /dev/null +++ b/openvidu-server/src/main/resources/frontend/src/app/app.component.spec.ts @@ -0,0 +1,32 @@ +import { TestBed, async } from '@angular/core/testing'; + +import { AppComponent } from './app.component'; + +describe('AppComponent', () => { + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ + AppComponent + ], + }).compileComponents(); + })); + + it('should create the app', async(() => { + const fixture = TestBed.createComponent(AppComponent); + const app = fixture.debugElement.componentInstance; + expect(app).toBeTruthy(); + })); + + it(`should have as title 'app works!'`, async(() => { + const fixture = TestBed.createComponent(AppComponent); + const app = fixture.debugElement.componentInstance; + expect(app.title).toEqual('app works!'); + })); + + it('should render title in a h1 tag', async(() => { + const fixture = TestBed.createComponent(AppComponent); + fixture.detectChanges(); + const compiled = fixture.debugElement.nativeElement; + expect(compiled.querySelector('h1').textContent).toContain('app works!'); + })); +}); diff --git a/openvidu-server/src/main/resources/frontend/src/app/app.component.ts b/openvidu-server/src/main/resources/frontend/src/app/app.component.ts new file mode 100644 index 00000000..2532abe7 --- /dev/null +++ b/openvidu-server/src/main/resources/frontend/src/app/app.component.ts @@ -0,0 +1,47 @@ +import { Component, OnInit, OnDestroy, HostListener } from '@angular/core'; +import { Router } from '@angular/router'; + +import { InfoService } from 'app/services/info.service'; + +@Component({ + selector: 'app-root', + templateUrl: './app.component.html', + styleUrls: ['./app.component.css'] +}) +export class AppComponent implements OnInit, OnDestroy { + + websocket: WebSocket; + + constructor(private infoService: InfoService) { } + + ngOnInit() { + this.websocket = new WebSocket('wss://' + location.hostname + ':8443/info'); + + this.websocket.onopen = (event) => { + console.log('Info websocket connected'); + }; + this.websocket.onclose = (event) => { + console.log('Info websocket closed'); + }; + this.websocket.onerror = (event) => { + console.log('Info websocket error'); + }; + this.websocket.onmessage = (event) => { + console.log('Info websocket message'); + console.log(event.data); + this.infoService.updateInfo(event.data); + + }; + } + + ngOnDestroy() { + this.websocket.close(); + } + + @HostListener('window:beforeunload', ['$event']) + beforeUnloadHander(event) { + console.warn('Closing info websocket'); + this.websocket.close(); + } + +} diff --git a/openvidu-server/src/main/resources/frontend/src/app/app.material.module.ts b/openvidu-server/src/main/resources/frontend/src/app/app.material.module.ts new file mode 100644 index 00000000..f3f3b192 --- /dev/null +++ b/openvidu-server/src/main/resources/frontend/src/app/app.material.module.ts @@ -0,0 +1,14 @@ +import { NgModule } from '@angular/core'; +import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; +import { + MdButtonModule, + MdCheckboxModule, + MdCardModule, + MdInputModule +} from '@angular/material'; + +@NgModule({ + imports: [BrowserAnimationsModule, MdButtonModule, MdCheckboxModule, MdCardModule, MdInputModule], + exports: [BrowserAnimationsModule, MdButtonModule, MdCheckboxModule, MdCardModule, MdInputModule], +}) +export class AppMaterialModule { } diff --git a/openvidu-server/src/main/resources/frontend/src/app/app.module.ts b/openvidu-server/src/main/resources/frontend/src/app/app.module.ts new file mode 100644 index 00000000..45b8ee16 --- /dev/null +++ b/openvidu-server/src/main/resources/frontend/src/app/app.module.ts @@ -0,0 +1,33 @@ +import { BrowserModule } from '@angular/platform-browser'; +import { NgModule } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { HttpModule } from '@angular/http'; +import { RouterModule } from '@angular/router'; + +import { routing } from './app.routing'; +import { AppMaterialModule } from 'app/app.material.module'; + +import { InfoService } from './services/info.service'; + +import { AppComponent } from './app.component'; +import { DashboardComponent } from './components/dashboard/dashboard.component'; +import { SessionDetailsComponent } from './components/session-details/session-details.component'; + + +@NgModule({ + declarations: [ + AppComponent, + DashboardComponent, + SessionDetailsComponent + ], + imports: [ + BrowserModule, + FormsModule, + HttpModule, + routing, + AppMaterialModule + ], + providers: [InfoService], + bootstrap: [AppComponent] +}) +export class AppModule { } diff --git a/openvidu-server/src/main/resources/frontend/src/app/app.routing.ts b/openvidu-server/src/main/resources/frontend/src/app/app.routing.ts new file mode 100644 index 00000000..40d1b612 --- /dev/null +++ b/openvidu-server/src/main/resources/frontend/src/app/app.routing.ts @@ -0,0 +1,18 @@ +import { ModuleWithProviders } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { DashboardComponent } from 'app/components/dashboard/dashboard.component'; +import { SessionDetailsComponent } from 'app/components/session-details/session-details.component'; + +const appRoutes: Routes = [ + { + path: '', + component: DashboardComponent + }, + { + path: 'session/:id', + component: SessionDetailsComponent + } +]; + +export const routing: ModuleWithProviders = RouterModule.forRoot(appRoutes); diff --git a/openvidu-server/src/main/resources/frontend/src/app/components/dashboard/dashboard.component.css b/openvidu-server/src/main/resources/frontend/src/app/components/dashboard/dashboard.component.css new file mode 100644 index 00000000..e5e24311 --- /dev/null +++ b/openvidu-server/src/main/resources/frontend/src/app/components/dashboard/dashboard.component.css @@ -0,0 +1,14 @@ +#log { + height: 100%; +} + +#log-content { + height: 90%; + font-family: Consolas, 'Liberation Mono', Menlo, Courier, monospace; + overflow-y: auto; + overflow-x: hidden +} + +ul { + margin: 0; +} diff --git a/openvidu-server/src/main/resources/frontend/src/app/components/dashboard/dashboard.component.html b/openvidu-server/src/main/resources/frontend/src/app/components/dashboard/dashboard.component.html new file mode 100644 index 00000000..f5e9069f --- /dev/null +++ b/openvidu-server/src/main/resources/frontend/src/app/components/dashboard/dashboard.component.html @@ -0,0 +1,11 @@ + + Server events + + + + +

{{i}}

+ + + + diff --git a/openvidu-server/src/main/resources/frontend/src/app/components/dashboard/dashboard.component.spec.ts b/openvidu-server/src/main/resources/frontend/src/app/components/dashboard/dashboard.component.spec.ts new file mode 100644 index 00000000..9c996c37 --- /dev/null +++ b/openvidu-server/src/main/resources/frontend/src/app/components/dashboard/dashboard.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { DashboardComponent } from './dashboard.component'; + +describe('DashboardComponent', () => { + let component: DashboardComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ DashboardComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(DashboardComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/openvidu-server/src/main/resources/frontend/src/app/components/dashboard/dashboard.component.ts b/openvidu-server/src/main/resources/frontend/src/app/components/dashboard/dashboard.component.ts new file mode 100644 index 00000000..f5abdc6e --- /dev/null +++ b/openvidu-server/src/main/resources/frontend/src/app/components/dashboard/dashboard.component.ts @@ -0,0 +1,43 @@ +import { Component, OnInit, AfterViewChecked, ViewChild, ElementRef } from '@angular/core'; +import { Subscription } from 'rxjs/Subscription'; + +import { InfoService } from '../../services/info.service'; + +@Component({ + selector: 'app-dashboard', + templateUrl: './dashboard.component.html', + styleUrls: ['./dashboard.component.css'], +}) +export class DashboardComponent implements OnInit, AfterViewChecked { + + @ViewChild('scrollMe') private myScrollContainer: ElementRef; + + infoSubscription: Subscription; + info = []; + + constructor(private infoService: InfoService) { + + // Subscription to info updated event raised by InfoService + this.infoSubscription = this.infoService.newInfo$.subscribe( + info => { + this.info.push(info); + }); + } + + ngOnInit() { + + } + + ngAfterViewChecked() { + this.scrollToBottom(); + } + + scrollToBottom(): void { + try { + this.myScrollContainer.nativeElement.scrollTop = this.myScrollContainer.nativeElement.scrollHeight; + } catch (err) { + console.log('[Error]:' + err.toString()); + } + } + +} diff --git a/openvidu-server/src/main/resources/frontend/src/app/components/session-details/session-details.component.css b/openvidu-server/src/main/resources/frontend/src/app/components/session-details/session-details.component.css new file mode 100644 index 00000000..e69de29b diff --git a/openvidu-server/src/main/resources/frontend/src/app/components/session-details/session-details.component.html b/openvidu-server/src/main/resources/frontend/src/app/components/session-details/session-details.component.html new file mode 100644 index 00000000..db83cc1b --- /dev/null +++ b/openvidu-server/src/main/resources/frontend/src/app/components/session-details/session-details.component.html @@ -0,0 +1,3 @@ +

+ session-details works! +

diff --git a/openvidu-server/src/main/resources/frontend/src/app/components/session-details/session-details.component.spec.ts b/openvidu-server/src/main/resources/frontend/src/app/components/session-details/session-details.component.spec.ts new file mode 100644 index 00000000..1f1d2fb7 --- /dev/null +++ b/openvidu-server/src/main/resources/frontend/src/app/components/session-details/session-details.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { SessionDetailsComponent } from './session-details.component'; + +describe('SessionDetailsComponent', () => { + let component: SessionDetailsComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ SessionDetailsComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(SessionDetailsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/openvidu-server/src/main/resources/frontend/src/app/components/session-details/session-details.component.ts b/openvidu-server/src/main/resources/frontend/src/app/components/session-details/session-details.component.ts new file mode 100644 index 00000000..95b253f2 --- /dev/null +++ b/openvidu-server/src/main/resources/frontend/src/app/components/session-details/session-details.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-session-details', + templateUrl: './session-details.component.html', + styleUrls: ['./session-details.component.css'] +}) +export class SessionDetailsComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/openvidu-server/src/main/resources/frontend/src/app/services/info.service.spec.ts b/openvidu-server/src/main/resources/frontend/src/app/services/info.service.spec.ts new file mode 100644 index 00000000..b850bd26 --- /dev/null +++ b/openvidu-server/src/main/resources/frontend/src/app/services/info.service.spec.ts @@ -0,0 +1,15 @@ +import { TestBed, inject } from '@angular/core/testing'; + +import { InfoService } from './info.service'; + +describe('CommunicationService', () => { + beforeEach(() => { + TestBed.configureTestingModule({ + providers: [InfoService] + }); + }); + + it('should ...', inject([InfoService], (service: InfoService) => { + expect(service).toBeTruthy(); + })); +}); diff --git a/openvidu-server/src/main/resources/frontend/src/app/services/info.service.ts b/openvidu-server/src/main/resources/frontend/src/app/services/info.service.ts new file mode 100644 index 00000000..91268cd8 --- /dev/null +++ b/openvidu-server/src/main/resources/frontend/src/app/services/info.service.ts @@ -0,0 +1,23 @@ +import { Injectable } from '@angular/core'; +import { Subject } from 'rxjs/Subject'; + +@Injectable() +export class InfoService { + + info: string; + newInfo$: Subject; + + constructor() { + this.newInfo$ = new Subject(); + } + + getInfo() { + return this.info; + } + + updateInfo(info: string) { + this.info = info; + this.newInfo$.next(info); + } + +} diff --git a/openvidu-server/src/main/resources/frontend/src/assets/.gitkeep b/openvidu-server/src/main/resources/frontend/src/assets/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/openvidu-server/src/main/resources/frontend/src/environments/environment.prod.ts b/openvidu-server/src/main/resources/frontend/src/environments/environment.prod.ts new file mode 100644 index 00000000..3612073b --- /dev/null +++ b/openvidu-server/src/main/resources/frontend/src/environments/environment.prod.ts @@ -0,0 +1,3 @@ +export const environment = { + production: true +}; diff --git a/openvidu-server/src/main/resources/frontend/src/environments/environment.ts b/openvidu-server/src/main/resources/frontend/src/environments/environment.ts new file mode 100644 index 00000000..b7f639ae --- /dev/null +++ b/openvidu-server/src/main/resources/frontend/src/environments/environment.ts @@ -0,0 +1,8 @@ +// The file contents for the current environment will overwrite these during build. +// The build system defaults to the dev environment which uses `environment.ts`, but if you do +// `ng build --env=prod` then `environment.prod.ts` will be used instead. +// The list of which env maps to which file can be found in `.angular-cli.json`. + +export const environment = { + production: false +}; diff --git a/openvidu-server/src/main/resources/frontend/src/favicon.ico b/openvidu-server/src/main/resources/frontend/src/favicon.ico new file mode 100644 index 00000000..8081c7ce Binary files /dev/null and b/openvidu-server/src/main/resources/frontend/src/favicon.ico differ diff --git a/openvidu-server/src/main/resources/frontend/src/index.html b/openvidu-server/src/main/resources/frontend/src/index.html new file mode 100644 index 00000000..452211bf --- /dev/null +++ b/openvidu-server/src/main/resources/frontend/src/index.html @@ -0,0 +1,20 @@ + + + + + + Frontend + + + + + + + + + + + + + + diff --git a/openvidu-server/src/main/resources/frontend/src/main.ts b/openvidu-server/src/main/resources/frontend/src/main.ts new file mode 100644 index 00000000..a9ca1caf --- /dev/null +++ b/openvidu-server/src/main/resources/frontend/src/main.ts @@ -0,0 +1,11 @@ +import { enableProdMode } from '@angular/core'; +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app/app.module'; +import { environment } from './environments/environment'; + +if (environment.production) { + enableProdMode(); +} + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/openvidu-server/src/main/resources/frontend/src/polyfills.ts b/openvidu-server/src/main/resources/frontend/src/polyfills.ts new file mode 100644 index 00000000..53bdaf1b --- /dev/null +++ b/openvidu-server/src/main/resources/frontend/src/polyfills.ts @@ -0,0 +1,68 @@ +/** + * This file includes polyfills needed by Angular and is loaded before the app. + * You can add your own extra polyfills to this file. + * + * This file is divided into 2 sections: + * 1. Browser polyfills. These are applied before loading ZoneJS and are sorted by browsers. + * 2. Application imports. Files imported after ZoneJS that should be loaded before your main + * file. + * + * The current setup is for so-called "evergreen" browsers; the last versions of browsers that + * automatically update themselves. This includes Safari >= 10, Chrome >= 55 (including Opera), + * Edge >= 13 on the desktop, and iOS 10 and Chrome on mobile. + * + * Learn more in https://angular.io/docs/ts/latest/guide/browser-support.html + */ + +/*************************************************************************************************** + * BROWSER POLYFILLS + */ + +/** IE9, IE10 and IE11 requires all of the following polyfills. **/ +// import 'core-js/es6/symbol'; +// import 'core-js/es6/object'; +// import 'core-js/es6/function'; +// import 'core-js/es6/parse-int'; +// import 'core-js/es6/parse-float'; +// import 'core-js/es6/number'; +// import 'core-js/es6/math'; +// import 'core-js/es6/string'; +// import 'core-js/es6/date'; +// import 'core-js/es6/array'; +// import 'core-js/es6/regexp'; +// import 'core-js/es6/map'; +// import 'core-js/es6/set'; + +/** IE10 and IE11 requires the following for NgClass support on SVG elements */ +// import 'classlist.js'; // Run `npm install --save classlist.js`. + +/** IE10 and IE11 requires the following to support `@angular/animation`. */ +// import 'web-animations-js'; // Run `npm install --save web-animations-js`. + + +/** Evergreen browsers require these. **/ +import 'core-js/es6/reflect'; +import 'core-js/es7/reflect'; + + +/** ALL Firefox browsers require the following to support `@angular/animation`. **/ +// import 'web-animations-js'; // Run `npm install --save web-animations-js`. + + + +/*************************************************************************************************** + * Zone JS is required by Angular itself. + */ +import 'zone.js/dist/zone'; // Included with Angular CLI. + + + +/*************************************************************************************************** + * APPLICATION IMPORTS + */ + +/** + * Date, currency, decimal and percent pipes. + * Needed for: All but Chrome, Firefox, Edge, IE11 and Safari 10 + */ +// import 'intl'; // Run `npm install --save intl`. diff --git a/openvidu-server/src/main/resources/frontend/src/styles.css b/openvidu-server/src/main/resources/frontend/src/styles.css new file mode 100644 index 00000000..1a5eb5f7 --- /dev/null +++ b/openvidu-server/src/main/resources/frontend/src/styles.css @@ -0,0 +1,17 @@ +@import '~@angular/material/prebuilt-themes/deeppurple-amber.css'; +html, +body { + height: 100%; + margin: 0; + padding: 0; + -webkit-tap-highlight-color: rgba(0, 0, 0, 0.05); +} + +main { + height: 90%; + padding: 20px; +} + +li { + list-style: none; +} diff --git a/openvidu-server/src/main/resources/frontend/src/test.ts b/openvidu-server/src/main/resources/frontend/src/test.ts new file mode 100644 index 00000000..9bf72267 --- /dev/null +++ b/openvidu-server/src/main/resources/frontend/src/test.ts @@ -0,0 +1,32 @@ +// This file is required by karma.conf.js and loads recursively all the .spec and framework files + +import 'zone.js/dist/long-stack-trace-zone'; +import 'zone.js/dist/proxy.js'; +import 'zone.js/dist/sync-test'; +import 'zone.js/dist/jasmine-patch'; +import 'zone.js/dist/async-test'; +import 'zone.js/dist/fake-async-test'; +import { getTestBed } from '@angular/core/testing'; +import { + BrowserDynamicTestingModule, + platformBrowserDynamicTesting +} from '@angular/platform-browser-dynamic/testing'; + +// Unfortunately there's no typing for the `__karma__` variable. Just declare it as any. +declare var __karma__: any; +declare var require: any; + +// Prevent Karma from running prematurely. +__karma__.loaded = function () {}; + +// First, initialize the Angular testing environment. +getTestBed().initTestEnvironment( + BrowserDynamicTestingModule, + platformBrowserDynamicTesting() +); +// Then we find all the tests. +const context = require.context('./', true, /\.spec\.ts$/); +// And load the modules. +context.keys().map(context); +// Finally, start Karma to run the tests. +__karma__.start(); diff --git a/openvidu-server/src/main/resources/frontend/src/tsconfig.app.json b/openvidu-server/src/main/resources/frontend/src/tsconfig.app.json new file mode 100644 index 00000000..5e2507db --- /dev/null +++ b/openvidu-server/src/main/resources/frontend/src/tsconfig.app.json @@ -0,0 +1,13 @@ +{ + "extends": "../tsconfig.json", + "compilerOptions": { + "outDir": "../out-tsc/app", + "module": "es2015", + "baseUrl": "", + "types": [] + }, + "exclude": [ + "test.ts", + "**/*.spec.ts" + ] +} diff --git a/openvidu-server/src/main/resources/frontend/src/tsconfig.spec.json b/openvidu-server/src/main/resources/frontend/src/tsconfig.spec.json new file mode 100644 index 00000000..510e3f1f --- /dev/null +++ b/openvidu-server/src/main/resources/frontend/src/tsconfig.spec.json @@ -0,0 +1,20 @@ +{ + "extends": "../tsconfig.json", + "compilerOptions": { + "outDir": "../out-tsc/spec", + "module": "commonjs", + "target": "es5", + "baseUrl": "", + "types": [ + "jasmine", + "node" + ] + }, + "files": [ + "test.ts" + ], + "include": [ + "**/*.spec.ts", + "**/*.d.ts" + ] +} diff --git a/openvidu-server/src/main/resources/frontend/src/typings.d.ts b/openvidu-server/src/main/resources/frontend/src/typings.d.ts new file mode 100644 index 00000000..ef5c7bd6 --- /dev/null +++ b/openvidu-server/src/main/resources/frontend/src/typings.d.ts @@ -0,0 +1,5 @@ +/* SystemJS module definition */ +declare var module: NodeModule; +interface NodeModule { + id: string; +} diff --git a/openvidu-server/src/main/resources/frontend/tsconfig.json b/openvidu-server/src/main/resources/frontend/tsconfig.json new file mode 100644 index 00000000..a35a8ee3 --- /dev/null +++ b/openvidu-server/src/main/resources/frontend/tsconfig.json @@ -0,0 +1,20 @@ +{ + "compileOnSave": false, + "compilerOptions": { + "outDir": "./dist/out-tsc", + "baseUrl": "src", + "sourceMap": true, + "declaration": false, + "moduleResolution": "node", + "emitDecoratorMetadata": true, + "experimentalDecorators": true, + "target": "es5", + "typeRoots": [ + "node_modules/@types" + ], + "lib": [ + "es2016", + "dom" + ] + } +} diff --git a/openvidu-server/src/main/resources/frontend/tslint.json b/openvidu-server/src/main/resources/frontend/tslint.json new file mode 100644 index 00000000..9113f136 --- /dev/null +++ b/openvidu-server/src/main/resources/frontend/tslint.json @@ -0,0 +1,116 @@ +{ + "rulesDirectory": [ + "node_modules/codelyzer" + ], + "rules": { + "callable-types": true, + "class-name": true, + "comment-format": [ + true, + "check-space" + ], + "curly": true, + "eofline": true, + "forin": true, + "import-blacklist": [true, "rxjs"], + "import-spacing": true, + "indent": [ + true, + "spaces" + ], + "interface-over-type-literal": true, + "label-position": true, + "max-line-length": [ + true, + 140 + ], + "member-access": false, + "member-ordering": [ + true, + "static-before-instance", + "variables-before-functions" + ], + "no-arg": true, + "no-bitwise": true, + "no-console": [ + true, + "debug", + "info", + "time", + "timeEnd", + "trace" + ], + "no-construct": true, + "no-debugger": true, + "no-duplicate-variable": true, + "no-empty": false, + "no-empty-interface": true, + "no-eval": true, + "no-inferrable-types": [true, "ignore-params"], + "no-shadowed-variable": true, + "no-string-literal": false, + "no-string-throw": true, + "no-switch-case-fall-through": true, + "no-trailing-whitespace": true, + "no-unused-expression": true, + "no-use-before-declare": true, + "no-var-keyword": true, + "object-literal-sort-keys": false, + "one-line": [ + true, + "check-open-brace", + "check-catch", + "check-else", + "check-whitespace" + ], + "prefer-const": true, + "quotemark": [ + true, + "single" + ], + "radix": true, + "semicolon": [ + "always" + ], + "triple-equals": [ + true, + "allow-null-check" + ], + "typedef-whitespace": [ + true, + { + "call-signature": "nospace", + "index-signature": "nospace", + "parameter": "nospace", + "property-declaration": "nospace", + "variable-declaration": "nospace" + } + ], + "typeof-compare": true, + "unified-signatures": true, + "variable-name": false, + "whitespace": [ + true, + "check-branch", + "check-decl", + "check-operator", + "check-separator", + "check-type" + ], + + "directive-selector": [true, "attribute", "app", "camelCase"], + "component-selector": [true, "element", "app", "kebab-case"], + "use-input-property-decorator": true, + "use-output-property-decorator": true, + "use-host-property-decorator": true, + "no-input-rename": true, + "no-output-rename": true, + "use-life-cycle-interface": true, + "use-pipe-transform-interface": true, + "component-class-suffix": true, + "directive-class-suffix": true, + "no-access-missing-member": true, + "templates-use-public": true, + "invoke-injectable": true + } +}