diff --git a/openvidu-node-client/lib/OpenVidu.d.ts b/openvidu-node-client/lib/OpenVidu.d.ts index ba1a5c4c..b39c76ce 100644 --- a/openvidu-node-client/lib/OpenVidu.d.ts +++ b/openvidu-node-client/lib/OpenVidu.d.ts @@ -5,6 +5,6 @@ export declare class OpenVidu { private secret; constructor(urlOpenViduServer: string, secret: string); createSession(properties?: SessionProperties): Session; - startArchive(sessionId: string): void; - stopArchive(sessionId: string): void; + startRecording(sessionId: string): void; + stopRecording(sessionId: string): void; } diff --git a/openvidu-node-client/lib/OpenVidu.js b/openvidu-node-client/lib/OpenVidu.js index 6fe6f0aa..f5f35f0f 100644 --- a/openvidu-node-client/lib/OpenVidu.js +++ b/openvidu-node-client/lib/OpenVidu.js @@ -9,10 +9,10 @@ var OpenVidu = /** @class */ (function () { OpenVidu.prototype.createSession = function (properties) { return new Session_1.Session(this.urlOpenViduServer, this.secret, properties); }; - OpenVidu.prototype.startArchive = function (sessionId) { + OpenVidu.prototype.startRecording = function (sessionId) { // TODO: REST POST to start recording in OpenVidu Server }; - OpenVidu.prototype.stopArchive = function (sessionId) { + OpenVidu.prototype.stopRecording = function (sessionId) { // TODO: REST POST to end recording in OpenVidu Server }; return OpenVidu; diff --git a/openvidu-node-client/lib/OpenVidu.js.map b/openvidu-node-client/lib/OpenVidu.js.map index d1bd3c2c..70cc61d2 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":";;AAAA,qCAAoC;AAGpC;IAEE,kBAAoB,iBAAyB,EAAU,MAAc;QAAjD,sBAAiB,GAAjB,iBAAiB,CAAQ;QAAU,WAAM,GAAN,MAAM,CAAQ;IAAI,CAAC;IAEnE,gCAAa,GAApB,UAAqB,UAA8B;QACjD,MAAM,CAAC,IAAI,iBAAO,CAAC,IAAI,CAAC,iBAAiB,EAAE,IAAI,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IACtE,CAAC;IAEM,+BAAY,GAAnB,UAAoB,SAAiB;QACnC,wDAAwD;IAC1D,CAAC;IAEM,8BAAW,GAAlB,UAAmB,SAAiB;QAClC,sDAAsD;IACxD,CAAC;IAEH,eAAC;AAAD,CAAC,AAhBD,IAgBC;AAhBY,4BAAQ"} \ No newline at end of file +{"version":3,"file":"OpenVidu.js","sourceRoot":"","sources":["../src/OpenVidu.ts"],"names":[],"mappings":";;AAAA,qCAAoC;AAGpC;IAEE,kBAAoB,iBAAyB,EAAU,MAAc;QAAjD,sBAAiB,GAAjB,iBAAiB,CAAQ;QAAU,WAAM,GAAN,MAAM,CAAQ;IAAI,CAAC;IAEnE,gCAAa,GAApB,UAAqB,UAA8B;QACjD,MAAM,CAAC,IAAI,iBAAO,CAAC,IAAI,CAAC,iBAAiB,EAAE,IAAI,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IACtE,CAAC;IAEM,iCAAc,GAArB,UAAsB,SAAiB;QACrC,wDAAwD;IAC1D,CAAC;IAEM,gCAAa,GAApB,UAAqB,SAAiB;QACpC,sDAAsD;IACxD,CAAC;IAEH,eAAC;AAAD,CAAC,AAhBD,IAgBC;AAhBY,4BAAQ"} \ 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 24330ac9..16b1b8eb 100644 --- a/openvidu-node-client/lib/Session.d.ts +++ b/openvidu-node-client/lib/Session.d.ts @@ -10,7 +10,7 @@ export declare class Session { private hostname; private port; constructor(urlOpenViduServer: string, secret: string, properties?: SessionProperties); - getSessionId(callback: Function): void; + getSessionId(callback: Function): Promise<{}>; generateToken(callback: Function): any; generateToken(tokenOptions: TokenOptions, callback: Function): any; getProperties(): SessionProperties; diff --git a/openvidu-node-client/lib/Session.js b/openvidu-node-client/lib/Session.js index 7146d2fc..2bfa48ac 100644 --- a/openvidu-node-client/lib/Session.js +++ b/openvidu-node-client/lib/Session.js @@ -20,90 +20,94 @@ var Session = /** @class */ (function () { } Session.prototype.getSessionId = function (callback) { var _this = this; - if (this.sessionId) { - callback(this.sessionId); - return; - } - var requestBody = JSON.stringify({ - 'archiveLayout': this.properties.archiveLayout(), - 'archiveMode': this.properties.archiveMode(), - 'mediaMode': this.properties.mediaMode() - }); - var options = { - hostname: this.hostname, - port: this.port, - path: this.sessionIdURL, - method: 'POST', - headers: { - 'Authorization': this.getBasicAuth(), - 'Content-Type': 'application/json', - 'Content-Length': Buffer.byteLength(requestBody) + return new Promise(function (resolve, reject) { + if (_this.sessionId) { + resolve(_this.sessionId); } - }; - var req = https.request(options, function (res) { - var body = ''; - res.on('data', function (d) { - // Continuously update stream with data - body += d; + var requestBody = JSON.stringify({ + 'archiveLayout': _this.properties.archiveLayout(), + 'archiveMode': _this.properties.archiveMode(), + 'mediaMode': _this.properties.mediaMode() }); - res.on('end', function () { - // Data reception is done - var parsed = JSON.parse(body); - _this.sessionId = parsed.id; - callback(parsed.id); + var options = { + hostname: _this.hostname, + port: _this.port, + path: _this.sessionIdURL, + method: 'POST', + headers: { + 'Authorization': _this.getBasicAuth(), + 'Content-Type': 'application/json', + 'Content-Length': Buffer.byteLength(requestBody) + } + }; + var req = https.request(options, function (res) { + var body = ''; + res.on('data', function (d) { + // Continuously update stream with data + body += d; + }); + res.on('end', function () { + // Data reception is done + var parsed = JSON.parse(body); + _this.sessionId = parsed.id; + resolve(parsed.id); + }); }); + req.on('error', function (e) { + reject(e); + }); + req.write(requestBody); + req.end(); }); - req.on('error', function (e) { - console.error(e); - }); - req.write(requestBody); - req.end(); }; Session.prototype.generateToken = function (tokenOptions, callback) { - var requestBody; - if (callback) { - 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': '' - }); - callback = tokenOptions; - } - var options = { - hostname: this.hostname, - port: this.port, - path: this.tokenURL, - method: 'POST', - headers: { - 'Authorization': this.getBasicAuth(), - 'Content-Type': 'application/json', - 'Content-Length': Buffer.byteLength(requestBody) + var _this = this; + return new Promise(function (resolve, reject) { + var requestBody; + if (callback) { + requestBody = JSON.stringify({ + 'session': _this.sessionId, + 'role': tokenOptions.getRole(), + 'data': tokenOptions.getData() + }); } - }; - var req = https.request(options, function (res) { - var body = ''; - res.on('data', function (d) { - // Continuously update stream with data - body += d; + else { + requestBody = JSON.stringify({ + 'session': _this.sessionId, + 'role': OpenViduRole_1.OpenViduRole.PUBLISHER, + 'data': '' + }); + callback = tokenOptions; + } + var options = { + hostname: _this.hostname, + port: _this.port, + path: _this.tokenURL, + method: 'POST', + headers: { + 'Authorization': _this.getBasicAuth(), + 'Content-Type': 'application/json', + 'Content-Length': Buffer.byteLength(requestBody) + } + }; + var req = https.request(options, function (res) { + var body = ''; + res.on('data', function (d) { + // Continuously update stream with data + body += d; + }); + res.on('end', function () { + // Data reception is done + var parsed = JSON.parse(body); + resolve(parsed.id); + }); }); - res.on('end', function () { - // Data reception is done - var parsed = JSON.parse(body); - callback(parsed.id); + req.on('error', function (e) { + reject(e); }); + req.write(requestBody); + req.end(); }); - req.on('error', function (e) { - console.error(e); - }); - req.write(requestBody); - req.end(); }; Session.prototype.getProperties = function () { return this.properties; diff --git a/openvidu-node-client/lib/Session.js.map b/openvidu-node-client/lib/Session.js.map index d693eb67..63963d77 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/src/Session.ts b/openvidu-node-client/src/Session.ts index 495c9a98..7c682780 100644 --- a/openvidu-node-client/src/Session.ts +++ b/openvidu-node-client/src/Session.ts @@ -26,100 +26,102 @@ export class Session { } public getSessionId(callback: Function) { - - if (this.sessionId) { - callback(this.sessionId); - return; - } - - let requestBody = JSON.stringify({ - 'archiveLayout': this.properties.archiveLayout(), - 'archiveMode': this.properties.archiveMode(), - 'mediaMode': this.properties.mediaMode() - }); - - let options = { - hostname: this.hostname, - port: this.port, - path: this.sessionIdURL, - method: 'POST', - headers: { - 'Authorization': this.getBasicAuth(), - 'Content-Type': 'application/json', - 'Content-Length': Buffer.byteLength(requestBody) + return new Promise((resolve, reject) => { + if (this.sessionId) { + resolve(this.sessionId); } - } - const req = https.request(options, (res) => { - let body = ''; - res.on('data', (d) => { - // Continuously update stream with data - body += d; - }); - res.on('end', () => { - // Data reception is done - let parsed = JSON.parse(body); - this.sessionId = parsed.id; - callback(parsed.id); - }); - }); - req.on('error', (e) => { - console.error(e); - }); - req.write(requestBody); - req.end(); + let requestBody = JSON.stringify({ + 'archiveLayout': this.properties.archiveLayout(), + 'archiveMode': this.properties.archiveMode(), + 'mediaMode': this.properties.mediaMode() + }); + + let options = { + hostname: this.hostname, + port: this.port, + path: this.sessionIdURL, + method: 'POST', + headers: { + 'Authorization': this.getBasicAuth(), + 'Content-Type': 'application/json', + 'Content-Length': Buffer.byteLength(requestBody) + } + } + const req = https.request(options, (res) => { + let body = ''; + res.on('data', (d) => { + // Continuously update stream with data + body += d; + }); + res.on('end', () => { + // Data reception is done + let parsed = JSON.parse(body); + this.sessionId = parsed.id; + resolve(parsed.id); + }); + }); + + req.on('error', (e) => { + reject(e); + }); + req.write(requestBody); + req.end(); + }) } public generateToken(callback: Function); public generateToken(tokenOptions: TokenOptions, callback: Function); public generateToken(tokenOptions: any, callback?: any) { - let requestBody; + return new Promise((resolve, reject) => { + let requestBody; - if (callback) { - requestBody = JSON.stringify({ - 'session': this.sessionId, - 'role': tokenOptions.getRole(), - 'data': tokenOptions.getData() - }); - } else { - requestBody = JSON.stringify({ - 'session': this.sessionId, - 'role': OpenViduRole.PUBLISHER, - 'data': '' - }); - callback = tokenOptions; - } - - let options = { - hostname: this.hostname, - port: this.port, - path: this.tokenURL, - method: 'POST', - headers: { - 'Authorization': this.getBasicAuth(), - 'Content-Type': 'application/json', - 'Content-Length': Buffer.byteLength(requestBody) + if (callback) { + requestBody = JSON.stringify({ + 'session': this.sessionId, + 'role': tokenOptions.getRole(), + 'data': tokenOptions.getData() + }); + } else { + requestBody = JSON.stringify({ + 'session': this.sessionId, + 'role': OpenViduRole.PUBLISHER, + 'data': '' + }); + callback = tokenOptions; } - }; - const req = https.request(options, (res) => { - let body = ''; - res.on('data', (d) => { - // Continuously update stream with data - body += d; - }); - res.on('end', () => { - // Data reception is done - let parsed = JSON.parse(body); - callback(parsed.id); - }); - }); - req.on('error', (e) => { - console.error(e); - }); - req.write(requestBody); - req.end(); + let options = { + hostname: this.hostname, + port: this.port, + path: this.tokenURL, + method: 'POST', + headers: { + 'Authorization': this.getBasicAuth(), + 'Content-Type': 'application/json', + 'Content-Length': Buffer.byteLength(requestBody) + } + }; + const req = https.request(options, (res) => { + let body = ''; + res.on('data', (d) => { + // Continuously update stream with data + body += d; + }); + res.on('end', () => { + // Data reception is done + let parsed = JSON.parse(body); + resolve(parsed.id); + }); + }); + + req.on('error', (e) => { + reject(e); + }); + req.write(requestBody); + req.end(); + }) } public getProperties(): SessionProperties {