diff --git a/openvidu-node-client/lib/OpenVidu.d.ts b/openvidu-node-client/lib/OpenVidu.d.ts index 037eecef..20ce14c6 100644 --- a/openvidu-node-client/lib/OpenVidu.d.ts +++ b/openvidu-node-client/lib/OpenVidu.d.ts @@ -1,7 +1,7 @@ -import { Session } from "./Session"; -import { SessionProperties } from "./SessionProperties"; -import { Recording } from "./Recording"; -import { RecordingProperties } from "./RecordingProperties"; +import { Session } from './Session'; +import { SessionProperties } from './SessionProperties'; +import { Recording } from './Recording'; +import { RecordingProperties } from './RecordingProperties'; export declare class OpenVidu { private urlOpenViduServer; private static readonly API_RECORDINGS; diff --git a/openvidu-node-client/lib/OpenVidu.js b/openvidu-node-client/lib/OpenVidu.js index 11f721d3..c94dadb3 100644 --- a/openvidu-node-client/lib/OpenVidu.js +++ b/openvidu-node-client/lib/OpenVidu.js @@ -37,9 +37,9 @@ var OpenVidu = /** @class */ (function () { var properties = param2; requestBody = JSON.stringify({ session: sessionId, - name: properties.name(), - recordingLayout: (!!properties.recordingLayout() ? properties.recordingLayout() : ''), - customLayout: (!!properties.customLayout() ? properties.customLayout() : '') + name: !!properties.name ? properties.name : '', + recordingLayout: !!properties.recordingLayout ? properties.recordingLayout : '', + customLayout: !!properties.customLayout ? properties.customLayout : '' }); } else { @@ -127,7 +127,7 @@ var OpenVidu = /** @class */ (function () { req.on('error', function (e) { reject(new Error(e)); }); - //req.write(); + // req.write(); req.end(); }); }; @@ -164,7 +164,7 @@ var OpenVidu = /** @class */ (function () { req.on('error', function (e) { reject(new Error(e)); }); - //req.write(); + // req.write(); req.end(); }); }; @@ -191,9 +191,10 @@ var OpenVidu = /** @class */ (function () { if (res.statusCode === 200) { // SUCCESS response from openvidu-server (JSON arrays of recordings in JSON format). Resolve list of new recordings var recordingArray = []; - var responseItems = JSON.parse(body)['items']; - for (var i = 0; i < responseItems.length; i++) { - recordingArray.push(new Recording_1.Recording(responseItems[i])); + var responseItems = JSON.parse(body).items; + for (var _i = 0, responseItems_1 = responseItems; _i < responseItems_1.length; _i++) { + var item = responseItems_1[_i]; + recordingArray.push(new Recording_1.Recording(item)); } resolve(recordingArray); } @@ -206,7 +207,7 @@ var OpenVidu = /** @class */ (function () { req.on('error', function (e) { reject(new Error(e)); }); - //req.write(); + // req.write(); req.end(); }); }; @@ -243,7 +244,7 @@ var OpenVidu = /** @class */ (function () { req.on('error', function (e) { reject(new Error(e)); }); - //req.write(); + // req.write(); req.end(); }); }; @@ -256,7 +257,7 @@ var OpenVidu = /** @class */ (function () { this.hostname = this.urlOpenViduServer.split(':')[1].replace(/\//g, ''); this.port = parseInt(this.urlOpenViduServer.split(':')[2].replace(/\//g, '')); } - else if (urlSplitted.length == 2) { + else if (urlSplitted.length === 2) { this.hostname = this.urlOpenViduServer.split(':')[0].replace(/\//g, ''); this.port = parseInt(this.urlOpenViduServer.split(':')[1].replace(/\//g, '')); } diff --git a/openvidu-node-client/lib/OpenVidu.js.map b/openvidu-node-client/lib/OpenVidu.js.map index 46d350c0..5bb75245 100644 --- a/openvidu-node-client/lib/OpenVidu.js.map +++ b/openvidu-node-client/lib/OpenVidu.js.map @@ -1 +1 @@ -{"version":3,"file":"OpenVidu.js","sourceRoot":"","sources":["../src/OpenVidu.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"OpenVidu.js","sourceRoot":"","sources":["../src/OpenVidu.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/openvidu-node-client/lib/OpenViduRole.js b/openvidu-node-client/lib/OpenViduRole.js index 4f9418c9..2f67d5ef 100644 --- a/openvidu-node-client/lib/OpenViduRole.js +++ b/openvidu-node-client/lib/OpenViduRole.js @@ -20,6 +20,6 @@ var OpenViduRole; (function (OpenViduRole) { OpenViduRole["SUBSCRIBER"] = "SUBSCRIBER"; OpenViduRole["PUBLISHER"] = "PUBLISHER"; - OpenViduRole["MODERATOR"] = "MODERATOR"; // SUBSCRIBER + PUBLIHSER permissions + can force unpublish() and disconnect() over a third-party stream or user + OpenViduRole["MODERATOR"] = "MODERATOR"; })(OpenViduRole = exports.OpenViduRole || (exports.OpenViduRole = {})); //# sourceMappingURL=OpenViduRole.js.map \ No newline at end of file diff --git a/openvidu-node-client/lib/OpenViduRole.js.map b/openvidu-node-client/lib/OpenViduRole.js.map index a290d1f0..8bfa043d 100644 --- a/openvidu-node-client/lib/OpenViduRole.js.map +++ b/openvidu-node-client/lib/OpenViduRole.js.map @@ -1 +1 @@ -{"version":3,"file":"OpenViduRole.js","sourceRoot":"","sources":["../src/OpenViduRole.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;GAeG;;AAEH,IAAY,YAIX;AAJD,WAAY,YAAY;IACvB,yCAAyB,CAAA;IACzB,uCAAuB,CAAA;IACvB,uCAAuB,CAAA,CAAE,gHAAgH;AAC1I,CAAC,EAJW,YAAY,GAAZ,oBAAY,KAAZ,oBAAY,QAIvB"} \ No newline at end of file +{"version":3,"file":"OpenViduRole.js","sourceRoot":"","sources":["../src/OpenViduRole.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;GAeG;;AAEH,IAAY,YAIX;AAJD,WAAY,YAAY;IACvB,yCAAyB,CAAA;IACzB,uCAAuB,CAAA;IACvB,uCAAuB,CAAA;AACxB,CAAC,EAJW,YAAY,GAAZ,oBAAY,KAAZ,oBAAY,QAIvB"} \ No newline at end of file diff --git a/openvidu-node-client/lib/Session.d.ts b/openvidu-node-client/lib/Session.d.ts index 8b35c511..506df0e9 100644 --- a/openvidu-node-client/lib/Session.d.ts +++ b/openvidu-node-client/lib/Session.d.ts @@ -1,5 +1,5 @@ -import { TokenOptions } from './TokenOptions'; import { SessionProperties } from './SessionProperties'; +import { TokenOptions } from './TokenOptions'; export declare class Session { private hostname; private port; diff --git a/openvidu-node-client/lib/Session.js b/openvidu-node-client/lib/Session.js index d237610b..4189df76 100644 --- a/openvidu-node-client/lib/Session.js +++ b/openvidu-node-client/lib/Session.js @@ -16,17 +16,19 @@ * */ Object.defineProperty(exports, "__esModule", { value: true }); +var MediaMode_1 = require("./MediaMode"); var OpenViduRole_1 = require("./OpenViduRole"); -var SessionProperties_1 = require("./SessionProperties"); +var RecordingLayout_1 = require("./RecordingLayout"); +var RecordingMode_1 = require("./RecordingMode"); var https = require('https'); var Session = /** @class */ (function () { function Session(hostname, port, basicAuth, properties) { this.hostname = hostname; this.port = port; this.basicAuth = basicAuth; - this.sessionId = ""; - if (properties == null) { - this.properties = new SessionProperties_1.SessionProperties.Builder().build(); + this.sessionId = ''; + if (properties === null) { + this.properties = {}; } else { this.properties = properties; @@ -39,10 +41,10 @@ var Session = /** @class */ (function () { resolve(_this.sessionId); } var requestBody = JSON.stringify({ - 'mediaMode': _this.properties.mediaMode(), - 'recordingMode': _this.properties.recordingMode(), - 'defaultRecordingLayout': _this.properties.defaultRecordingLayout(), - 'defaultCustomLayout': _this.properties.defaultCustomLayout() + mediaMode: !!_this.properties.mediaMode ? _this.properties.mediaMode : MediaMode_1.MediaMode.ROUTED, + recordingMode: !!_this.properties.recordingMode ? _this.properties.recordingMode : RecordingMode_1.RecordingMode.MANUAL, + defaultRecordingLayout: !!_this.properties.defaultRecordingLayout ? _this.properties.defaultRecordingLayout : RecordingLayout_1.RecordingLayout.BEST_FIT, + defaultCustomLayout: !!_this.properties.defaultCustomLayout ? _this.properties.defaultCustomLayout : '' }); var options = { hostname: _this.hostname, @@ -84,21 +86,11 @@ var Session = /** @class */ (function () { Session.prototype.generateToken = function (tokenOptions) { var _this = this; return new Promise(function (resolve, reject) { - var requestBody; - if (!!tokenOptions) { - requestBody = JSON.stringify({ - 'session': _this.sessionId, - 'role': tokenOptions.getRole(), - 'data': tokenOptions.getData() - }); - } - else { - requestBody = JSON.stringify({ - 'session': _this.sessionId, - 'role': OpenViduRole_1.OpenViduRole.PUBLISHER, - 'data': '' - }); - } + var requestBody = JSON.stringify({ + session: _this.sessionId, + role: !!tokenOptions.role ? tokenOptions.role : OpenViduRole_1.OpenViduRole.PUBLISHER, + data: !!tokenOptions.data ? tokenOptions.data : '' + }); var options = { hostname: _this.hostname, port: _this.port, diff --git a/openvidu-node-client/lib/Session.js.map b/openvidu-node-client/lib/Session.js.map index 84bdf66a..765f221c 100644 --- a/openvidu-node-client/lib/Session.js.map +++ b/openvidu-node-client/lib/Session.js.map @@ -1 +1 @@ -{"version":3,"file":"Session.js","sourceRoot":"","sources":["../src/Session.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"Session.js","sourceRoot":"","sources":["../src/Session.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/openvidu-node-client/lib/TokenOptions.d.ts b/openvidu-node-client/lib/TokenOptions.d.ts index e3a4b907..123f7a7b 100644 --- a/openvidu-node-client/lib/TokenOptions.d.ts +++ b/openvidu-node-client/lib/TokenOptions.d.ts @@ -1,17 +1,5 @@ -import { OpenViduRole } from "./OpenViduRole"; -export declare class TokenOptions { - private data; - private role; - constructor(data: string, role: OpenViduRole); - getData(): string; - getRole(): OpenViduRole; -} -export declare namespace TokenOptions { - class Builder { - private dataProp; - private roleProp; - build(): TokenOptions; - data(data: string): Builder; - role(role: OpenViduRole): Builder; - } +import { OpenViduRole } from './OpenViduRole'; +export interface TokenOptions { + data: string; + role: OpenViduRole; } diff --git a/openvidu-node-client/lib/TokenOptions.js b/openvidu-node-client/lib/TokenOptions.js index 1fd58176..78d0ef9c 100644 --- a/openvidu-node-client/lib/TokenOptions.js +++ b/openvidu-node-client/lib/TokenOptions.js @@ -16,42 +16,4 @@ * */ Object.defineProperty(exports, "__esModule", { value: true }); -var OpenViduRole_1 = require("./OpenViduRole"); -var TokenOptions = /** @class */ (function () { - function TokenOptions(data, role) { - this.data = data; - this.role = role; - } - TokenOptions.prototype.getData = function () { - return this.data; - }; - TokenOptions.prototype.getRole = function () { - return this.role; - }; - return TokenOptions; -}()); -exports.TokenOptions = TokenOptions; -(function (TokenOptions) { - var Builder = /** @class */ (function () { - function Builder() { - this.dataProp = ''; - this.roleProp = OpenViduRole_1.OpenViduRole.PUBLISHER; - } - Builder.prototype.build = function () { - return new TokenOptions(this.dataProp, this.roleProp); - }; - Builder.prototype.data = function (data) { - this.dataProp = data; - return this; - }; - Builder.prototype.role = function (role) { - this.roleProp = role; - return this; - }; - return Builder; - }()); - TokenOptions.Builder = Builder; - ; -})(TokenOptions = exports.TokenOptions || (exports.TokenOptions = {})); -exports.TokenOptions = TokenOptions; //# sourceMappingURL=TokenOptions.js.map \ No newline at end of file diff --git a/openvidu-node-client/lib/TokenOptions.js.map b/openvidu-node-client/lib/TokenOptions.js.map index d1f3c91f..c6d102b7 100644 --- a/openvidu-node-client/lib/TokenOptions.js.map +++ b/openvidu-node-client/lib/TokenOptions.js.map @@ -1 +1 @@ -{"version":3,"file":"TokenOptions.js","sourceRoot":"","sources":["../src/TokenOptions.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;GAeG;;AAEH,+CAA8C;AAE9C;IAEI,sBAAoB,IAAY,EAAU,IAAkB;QAAxC,SAAI,GAAJ,IAAI,CAAQ;QAAU,SAAI,GAAJ,IAAI,CAAc;IAAI,CAAC;IAEjE,8BAAO,GAAP;QACI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC;IACrB,CAAC;IAED,8BAAO,GAAP;QACI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC;IACrB,CAAC;IACL,mBAAC;AAAD,CAAC,AAXD,IAWC;AAXY,oCAAY;AAazB,WAAiB,YAAY;IACzB;QAAA;YAEY,aAAQ,GAAW,EAAE,CAAC;YACtB,aAAQ,GAAiB,2BAAY,CAAC,SAAS,CAAC;QAgB5D,CAAC;QAdG,uBAAK,GAAL;YACI,MAAM,CAAC,IAAI,YAAY,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC1D,CAAC;QAED,sBAAI,GAAJ,UAAK,IAAY;YACb,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;YACrB,MAAM,CAAC,IAAI,CAAC;QAChB,CAAC;QAED,sBAAI,GAAJ,UAAK,IAAkB;YACnB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;YACrB,MAAM,CAAC,IAAI,CAAC;QAChB,CAAC;QAEL,cAAC;IAAD,CAAC,AAnBD,IAmBC;IAnBY,oBAAO,UAmBnB,CAAA;IAAA,CAAC;AACN,CAAC,EArBgB,YAAY,GAAZ,oBAAY,KAAZ,oBAAY,QAqB5B;AAlCY,oCAAY"} \ No newline at end of file +{"version":3,"file":"TokenOptions.js","sourceRoot":"","sources":["../src/TokenOptions.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;GAeG"} \ No newline at end of file diff --git a/openvidu-node-client/lib/index.js b/openvidu-node-client/lib/index.js index 863bf7c8..79232b2e 100644 --- a/openvidu-node-client/lib/index.js +++ b/openvidu-node-client/lib/index.js @@ -6,11 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true }); __export(require("./OpenVidu")); __export(require("./OpenViduRole")); __export(require("./Session")); -__export(require("./SessionProperties")); -__export(require("./TokenOptions")); __export(require("./MediaMode")); __export(require("./RecordingLayout")); __export(require("./RecordingMode")); __export(require("./Recording")); -__export(require("./RecordingProperties")); //# sourceMappingURL=index.js.map \ No newline at end of file diff --git a/openvidu-node-client/lib/index.js.map b/openvidu-node-client/lib/index.js.map index f2c6de18..98aad725 100644 --- a/openvidu-node-client/lib/index.js.map +++ b/openvidu-node-client/lib/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;AAAA,gCAA2B;AAC3B,oCAA+B;AAC/B,+BAA0B;AAC1B,yCAAoC;AACpC,oCAA+B;AAC/B,iCAA4B;AAC5B,uCAAkC;AAClC,qCAAgC;AAChC,iCAA4B;AAC5B,2CAAsC"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;AAAA,gCAA2B;AAC3B,oCAA+B;AAC/B,+BAA0B;AAG1B,iCAA4B;AAC5B,uCAAkC;AAClC,qCAAgC;AAChC,iCAA4B"} \ No newline at end of file diff --git a/openvidu-node-client/src/OpenVidu.ts b/openvidu-node-client/src/OpenVidu.ts index f4550b00..bfdee37d 100644 --- a/openvidu-node-client/src/OpenVidu.ts +++ b/openvidu-node-client/src/OpenVidu.ts @@ -15,14 +15,14 @@ * */ -import { Session } from "./Session"; -import { SessionProperties } from "./SessionProperties"; -import { Recording } from "./Recording"; -import { RecordingProperties } from "./RecordingProperties"; -import { RecordingLayout } from "./RecordingLayout"; +import { Session } from './Session'; +import { SessionProperties } from './SessionProperties'; +import { Recording } from './Recording'; +import { RecordingLayout } from './RecordingLayout'; +import { RecordingProperties } from './RecordingProperties'; declare const Buffer; -let https = require('https'); +const https = require('https'); export class OpenVidu { @@ -57,9 +57,9 @@ export class OpenVidu { const properties = param2; requestBody = JSON.stringify({ session: sessionId, - name: properties.name(), - recordingLayout: (!!properties.recordingLayout() ? properties.recordingLayout() : ''), - customLayout: (!!properties.customLayout() ? properties.customLayout() : '') + name: !!properties.name ? properties.name : '', + recordingLayout: !!properties.recordingLayout ? properties.recordingLayout : '', + customLayout: !!properties.customLayout ? properties.customLayout : '' }); } else { requestBody = JSON.stringify({ @@ -78,7 +78,7 @@ export class OpenVidu { }); } - let options = { + const options = { hostname: this.hostname, port: this.port, path: OpenVidu.API_RECORDINGS + OpenVidu.API_RECORDINGS_START, @@ -88,7 +88,8 @@ export class OpenVidu { 'Content-Type': 'application/json', 'Content-Length': Buffer.byteLength(requestBody) } - } + }; + const req = https.request(options, (res) => { let body = ''; res.on('data', (d) => { @@ -118,7 +119,7 @@ export class OpenVidu { public stopRecording(recordingId: string): Promise { return new Promise((resolve, reject) => { - let options = { + const options = { hostname: this.hostname, port: this.port, path: OpenVidu.API_RECORDINGS + OpenVidu.API_RECORDINGS_STOP + '/' + recordingId, @@ -127,7 +128,8 @@ export class OpenVidu { 'Authorization': this.basicAuth, 'Content-Type': 'application/x-www-form-urlencoded' } - } + }; + const req = https.request(options, (res) => { let body = ''; res.on('data', (d) => { @@ -148,7 +150,7 @@ export class OpenVidu { req.on('error', (e) => { reject(new Error(e)); }); - //req.write(); + // req.write(); req.end(); }); @@ -157,7 +159,7 @@ export class OpenVidu { public getRecording(recordingId: string): Promise { return new Promise((resolve, reject) => { - let options = { + const options = { hostname: this.hostname, port: this.port, path: OpenVidu.API_RECORDINGS + '/' + recordingId, @@ -166,7 +168,8 @@ export class OpenVidu { 'Authorization': this.basicAuth, 'Content-Type': 'application/x-www-form-urlencoded' } - } + }; + const req = https.request(options, (res) => { let body = ''; res.on('data', (d) => { @@ -187,7 +190,7 @@ export class OpenVidu { req.on('error', (e) => { reject(new Error(e)); }); - //req.write(); + // req.write(); req.end(); }); @@ -196,7 +199,7 @@ export class OpenVidu { public listRecordings(): Promise { return new Promise((resolve, reject) => { - let options = { + const options = { hostname: this.hostname, port: this.port, path: OpenVidu.API_RECORDINGS, @@ -205,7 +208,8 @@ export class OpenVidu { 'Authorization': this.basicAuth, 'Content-Type': 'application/x-www-form-urlencoded' } - } + }; + const req = https.request(options, (res) => { let body = ''; res.on('data', (d) => { @@ -215,10 +219,10 @@ export class OpenVidu { res.on('end', () => { if (res.statusCode === 200) { // SUCCESS response from openvidu-server (JSON arrays of recordings in JSON format). Resolve list of new recordings - let recordingArray: Recording[] = []; - let responseItems = JSON.parse(body)['items']; - for (let i = 0; i < responseItems.length; i++) { - recordingArray.push(new Recording(responseItems[i])); + const recordingArray: Recording[] = []; + const responseItems = JSON.parse(body).items; + for (const item of responseItems) { + recordingArray.push(new Recording(item)); } resolve(recordingArray); } else { @@ -231,7 +235,7 @@ export class OpenVidu { req.on('error', (e) => { reject(new Error(e)); }); - //req.write(); + // req.write(); req.end(); }); @@ -240,7 +244,7 @@ export class OpenVidu { public deleteRecording(recordingId: string): Promise { return new Promise((resolve, reject) => { - let options = { + const options = { hostname: this.hostname, port: this.port, path: OpenVidu.API_RECORDINGS + '/' + recordingId, @@ -249,7 +253,8 @@ export class OpenVidu { 'Authorization': this.basicAuth, 'Content-Type': 'application/x-www-form-urlencoded' } - } + }; + const req = https.request(options, (res) => { let body = ''; res.on('data', (d) => { @@ -270,7 +275,7 @@ export class OpenVidu { req.on('error', (e) => { reject(new Error(e)); }); - //req.write(); + // req.write(); req.end(); }); @@ -281,11 +286,11 @@ export class OpenVidu { } private setHostnameAndPort(): void { - let urlSplitted = this.urlOpenViduServer.split(':'); + const urlSplitted = this.urlOpenViduServer.split(':'); if (urlSplitted.length === 3) { // URL has format: http:// + hostname + :port this.hostname = this.urlOpenViduServer.split(':')[1].replace(/\//g, ''); this.port = parseInt(this.urlOpenViduServer.split(':')[2].replace(/\//g, '')); - } else if (urlSplitted.length == 2) { // URL has format: hostname + :port + } else if (urlSplitted.length === 2) { // URL has format: hostname + :port this.hostname = this.urlOpenViduServer.split(':')[0].replace(/\//g, ''); this.port = parseInt(this.urlOpenViduServer.split(':')[1].replace(/\//g, '')); } else { diff --git a/openvidu-node-client/src/OpenViduRole.ts b/openvidu-node-client/src/OpenViduRole.ts index c68c898d..ba28c93d 100644 --- a/openvidu-node-client/src/OpenViduRole.ts +++ b/openvidu-node-client/src/OpenViduRole.ts @@ -16,7 +16,7 @@ */ export enum OpenViduRole { - SUBSCRIBER = 'SUBSCRIBER', // Can subscribe to published streams of other users - PUBLISHER = 'PUBLISHER', // SUBSCRIBER permissions + can subscribe to published streams of other users and publish their own streams - MODERATOR = 'MODERATOR' // SUBSCRIBER + PUBLIHSER permissions + can force unpublish() and disconnect() over a third-party stream or user + SUBSCRIBER = 'SUBSCRIBER', // Can subscribe to published streams of other users + PUBLISHER = 'PUBLISHER', // SUBSCRIBER permissions + can subscribe to published streams of other users and publish their own streams + MODERATOR = 'MODERATOR', // SUBSCRIBER + PUBLIHSER permissions + can force unpublish() and disconnect() over a third-party stream or user } \ No newline at end of file diff --git a/openvidu-node-client/src/Recording.ts b/openvidu-node-client/src/Recording.ts index 5654a850..35ec1969 100644 --- a/openvidu-node-client/src/Recording.ts +++ b/openvidu-node-client/src/Recording.ts @@ -15,22 +15,23 @@ * */ -import { RecordingProperties } from "./RecordingProperties"; -import { RecordingLayout } from "./RecordingLayout"; +import { RecordingLayout } from './RecordingLayout'; +import { RecordingProperties } from './RecordingProperties'; export class Recording { private id: string; private sessionId: string; private createdAt: number; - private size: number = 0; - private duration: number = 0; + private size = 0; + private duration = 0; private url: string; - private hasaudio: boolean = true; - private hasvideo: boolean = true; + private hasaudio = true; + private hasvideo = true; private status: Recording.Status; private recordingProperties: RecordingProperties; + /* tslint:disable:no-string-literal */ constructor(json: JSON) { this.id = json['id']; this.sessionId = json['sessionId']; @@ -41,8 +42,9 @@ export class Recording { this.hasaudio = json['hasAudio']; this.hasvideo = json['hasVideo']; this.status = json['status']; - this.recordingProperties = new RecordingProperties.Builder().name(json['name']).recordingLayout(json['layout']).build(); + this.recordingProperties = { name: json['name'], recordingLayout: json['layout'] }; } + /* tslint:enable:no-string-literal */ public getStatus(): Recording.Status { return this.status; @@ -53,11 +55,11 @@ export class Recording { } public getName(): string { - return this.recordingProperties.name(); + return this.recordingProperties.name; } public getLayout(): RecordingLayout { - return this.recordingProperties.recordingLayout(); + return this.recordingProperties.recordingLayout; } public getSessionId(): string { diff --git a/openvidu-node-client/src/RecordingProperties.ts b/openvidu-node-client/src/RecordingProperties.ts index ab7ab644..96c39f64 100644 --- a/openvidu-node-client/src/RecordingProperties.ts +++ b/openvidu-node-client/src/RecordingProperties.ts @@ -15,50 +15,10 @@ * */ -import { RecordingLayout } from "./RecordingLayout"; +import { RecordingLayout } from './RecordingLayout'; -export class RecordingProperties { - - constructor(private rName: string, private recordingLayoutProp: RecordingLayout, private customLayoutProp: string) { } - - name(): string { - return this.rName; - } - - recordingLayout(): RecordingLayout { - return this.recordingLayoutProp; - } - - customLayout(): string { - return this.customLayoutProp; - } - -} - -export namespace RecordingProperties { - export class Builder { - - private rName: string = ''; - private recordingLayoutProp: RecordingLayout; - private customLayoutProp: string; - - build(): RecordingProperties { - return new RecordingProperties(this.rName, this.recordingLayoutProp, this.customLayoutProp); - } - - name(name: string): Builder { - this.rName = name; - return this; - } - - recordingLayout(layout: RecordingLayout): Builder { - this.recordingLayoutProp = layout; - return this; - } - - customLayout(path: string): Builder { - this.customLayoutProp = path; - return this; - } - }; +export interface RecordingProperties { + name?: string; + recordingLayout?: RecordingLayout; + customLayout?: string; } \ No newline at end of file diff --git a/openvidu-node-client/src/Session.ts b/openvidu-node-client/src/Session.ts index d402b494..994d19ba 100644 --- a/openvidu-node-client/src/Session.ts +++ b/openvidu-node-client/src/Session.ts @@ -15,26 +15,29 @@ * */ -import { TokenOptions } from './TokenOptions'; +import { MediaMode } from './MediaMode'; import { OpenViduRole } from './OpenViduRole'; +import { RecordingLayout } from './RecordingLayout'; +import { RecordingMode } from './RecordingMode'; import { SessionProperties } from './SessionProperties'; +import { TokenOptions } from './TokenOptions'; declare const Buffer; declare const require; -let https = require('https'); +const https = require('https'); export class Session { - private static readonly API_SESSIONS: string = '/api/sessions'; - private static readonly API_TOKENS: string = '/api/tokens'; + private static readonly API_SESSIONS = '/api/sessions'; + private static readonly API_TOKENS = '/api/tokens'; - private sessionId: string = ""; + private sessionId = ''; private properties: SessionProperties; constructor(private hostname: string, private port: number, private basicAuth: string, properties?: SessionProperties) { - if (properties == null) { - this.properties = new SessionProperties.Builder().build(); + if (properties === null) { + this.properties = {}; } else { this.properties = properties; } @@ -47,14 +50,14 @@ export class Session { resolve(this.sessionId); } - let requestBody = JSON.stringify({ - 'mediaMode': this.properties.mediaMode(), - 'recordingMode': this.properties.recordingMode(), - 'defaultRecordingLayout': this.properties.defaultRecordingLayout(), - 'defaultCustomLayout': this.properties.defaultCustomLayout() + const requestBody = JSON.stringify({ + mediaMode: !!this.properties.mediaMode ? this.properties.mediaMode : MediaMode.ROUTED, + recordingMode: !!this.properties.recordingMode ? this.properties.recordingMode : RecordingMode.MANUAL, + defaultRecordingLayout: !!this.properties.defaultRecordingLayout ? this.properties.defaultRecordingLayout : RecordingLayout.BEST_FIT, + defaultCustomLayout: !!this.properties.defaultCustomLayout ? this.properties.defaultCustomLayout : '' }); - let options = { + const options = { hostname: this.hostname, port: this.port, path: Session.API_SESSIONS, @@ -64,7 +67,8 @@ export class Session { 'Content-Type': 'application/json', 'Content-Length': Buffer.byteLength(requestBody) } - } + }; + const req = https.request(options, (res) => { let body = ''; res.on('data', (d) => { @@ -74,7 +78,7 @@ export class Session { res.on('end', () => { if (res.statusCode === 200) { // SUCCESS response from openvidu-server. Resolve sessionId - let parsed = JSON.parse(body); + const parsed = JSON.parse(body); this.sessionId = parsed.id; resolve(parsed.id); } else { @@ -95,23 +99,13 @@ export class Session { public generateToken(tokenOptions?: TokenOptions): Promise { return new Promise((resolve, reject) => { - let requestBody; + const requestBody = JSON.stringify({ + session: this.sessionId, + role: !!tokenOptions.role ? tokenOptions.role : OpenViduRole.PUBLISHER, + data: !!tokenOptions.data ? tokenOptions.data : '' + }); - if (!!tokenOptions) { - requestBody = JSON.stringify({ - 'session': this.sessionId, - 'role': tokenOptions.getRole(), - 'data': tokenOptions.getData() - }); - } else { - requestBody = JSON.stringify({ - 'session': this.sessionId, - 'role': OpenViduRole.PUBLISHER, - 'data': '' - }); - } - - let options = { + const options = { hostname: this.hostname, port: this.port, path: Session.API_TOKENS, @@ -122,6 +116,7 @@ export class Session { 'Content-Length': Buffer.byteLength(requestBody) } }; + const req = https.request(options, (res) => { let body = ''; res.on('data', (d) => { @@ -131,7 +126,7 @@ export class Session { res.on('end', () => { if (res.statusCode === 200) { // SUCCESS response from openvidu-server. Resolve token - let parsed = JSON.parse(body); + const parsed = JSON.parse(body); resolve(parsed.id); } else { // ERROR response from openvidu-server. Resolve HTTP status diff --git a/openvidu-node-client/src/SessionProperties.ts b/openvidu-node-client/src/SessionProperties.ts index 366aa653..fc905694 100644 --- a/openvidu-node-client/src/SessionProperties.ts +++ b/openvidu-node-client/src/SessionProperties.ts @@ -15,61 +15,13 @@ * */ -import { MediaMode } from "./MediaMode"; -import { RecordingMode } from "./RecordingMode"; -import { RecordingLayout } from "./RecordingLayout"; +import { MediaMode } from './MediaMode'; +import { RecordingLayout } from './RecordingLayout'; +import { RecordingMode } from './RecordingMode'; -export class SessionProperties { - - constructor(private mediaModeProp: MediaMode, private recordingModeProp: RecordingMode, private defaultRecordingLayoutProp: RecordingLayout, private defaultCustomLayoutProp: string) { } - - mediaMode(): string { - return this.mediaModeProp; - } - - recordingMode(): RecordingMode { - return this.recordingModeProp; - } - - defaultRecordingLayout(): RecordingLayout { - return this.defaultRecordingLayoutProp; - } - - defaultCustomLayout(): string { - return this.defaultCustomLayoutProp; - } -} - -export namespace SessionProperties { - export class Builder { - - private mediaModeProp: MediaMode = MediaMode.ROUTED; - private recordingModeProp: RecordingMode = RecordingMode.MANUAL; - private defaultRecordingLayoutProp: RecordingLayout = RecordingLayout.BEST_FIT; - private defaultCustomLayoutProp: string = ''; - - build(): SessionProperties { - return new SessionProperties(this.mediaModeProp, this.recordingModeProp, this.defaultRecordingLayoutProp, this.defaultCustomLayoutProp); - } - - mediaMode(mediaMode: MediaMode): Builder { - this.mediaModeProp = mediaMode; - return this; - } - - recordingMode(recordingMode: RecordingMode): Builder { - this.recordingModeProp = recordingMode; - return this; - } - - defaultRecordingLayout(layout: RecordingLayout): Builder { - this.defaultRecordingLayoutProp = layout; - return this; - } - - defaultCustomLayout(path: string): Builder { - this.defaultCustomLayoutProp = path; - return this; - } - }; +export interface SessionProperties { + mediaMode?: MediaMode; + recordingMode?: RecordingMode; + defaultRecordingLayout?: RecordingLayout; + defaultCustomLayout?: string; } diff --git a/openvidu-node-client/src/TokenOptions.ts b/openvidu-node-client/src/TokenOptions.ts index a2f5bcb7..72ea5cff 100644 --- a/openvidu-node-client/src/TokenOptions.ts +++ b/openvidu-node-client/src/TokenOptions.ts @@ -15,40 +15,9 @@ * */ -import { OpenViduRole } from "./OpenViduRole"; +import { OpenViduRole } from './OpenViduRole'; -export class TokenOptions { - - constructor(private data: string, private role: OpenViduRole) { } - - getData(): string { - return this.data; - } - - getRole(): OpenViduRole { - return this.role; - } -} - -export namespace TokenOptions { - export class Builder { - - private dataProp: string = ''; - private roleProp: OpenViduRole = OpenViduRole.PUBLISHER; - - build(): TokenOptions { - return new TokenOptions(this.dataProp, this.roleProp); - } - - data(data: string): Builder { - this.dataProp = data; - return this; - } - - role(role: OpenViduRole): Builder { - this.roleProp = role; - return this; - } - - }; -} +export interface TokenOptions { + data: string; + role: OpenViduRole; +} \ No newline at end of file