From a34e6db9021974fbdb03f4a6f3be9ac392afdb32 Mon Sep 17 00:00:00 2001 From: pabloFuente Date: Wed, 18 Apr 2018 10:56:28 +0200 Subject: [PATCH] openvidu-node.client promisified (Session.getSessionId, Session.generateToken) --- openvidu-node-client/lib/Session.d.ts | 5 +- openvidu-node-client/lib/Session.js | 177 +++++++++-------- openvidu-node-client/lib/Session.js.map | 2 +- openvidu-node-client/src/Session.ts | 188 +++++++++--------- .../src/app/services/openvidu-rest.service.ts | 28 ++- 5 files changed, 204 insertions(+), 196 deletions(-) diff --git a/openvidu-node-client/lib/Session.d.ts b/openvidu-node-client/lib/Session.d.ts index 4494ea68..8b35c511 100644 --- a/openvidu-node-client/lib/Session.d.ts +++ b/openvidu-node-client/lib/Session.d.ts @@ -9,8 +9,7 @@ export declare class Session { private sessionId; private properties; constructor(hostname: string, port: number, basicAuth: string, properties?: SessionProperties); - getSessionId(callback: Function): void; - generateToken(callback: Function): any; - generateToken(tokenOptions: TokenOptions, callback: Function): any; + getSessionId(): Promise; + generateToken(tokenOptions?: TokenOptions): Promise; getProperties(): SessionProperties; } diff --git a/openvidu-node-client/lib/Session.js b/openvidu-node-client/lib/Session.js index 3e8e1863..fc1b66d8 100644 --- a/openvidu-node-client/lib/Session.js +++ b/openvidu-node-client/lib/Session.js @@ -16,104 +16,107 @@ var Session = /** @class */ (function () { this.properties = properties; } } - Session.prototype.getSessionId = function (callback) { + Session.prototype.getSessionId = function () { var _this = this; - if (this.sessionId) { - callback(this.sessionId); - return; - } - var requestBody = JSON.stringify({ - 'recordingLayout': this.properties.recordingLayout(), - 'recordingMode': this.properties.recordingMode(), - 'mediaMode': this.properties.mediaMode() - }); - var options = { - hostname: this.hostname, - port: this.port, - path: Session.API_SESSIONS, - method: 'POST', - headers: { - 'Authorization': this.basicAuth, - '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({ + 'recordingLayout': _this.properties.recordingLayout(), + 'recordingMode': _this.properties.recordingMode(), + 'mediaMode': _this.properties.mediaMode() }); - res.on('end', function () { - if (res.statusCode === 200) { - // SUCCESS response from openvidu-server. Resolve sessionId - var parsed = JSON.parse(body); - _this.sessionId = parsed.id; - callback(parsed.id); - } - else { - // ERROR response from openvidu-server. Resolve HTTP status - console.error(res.statusCode); + var options = { + hostname: _this.hostname, + port: _this.port, + path: Session.API_SESSIONS, + method: 'POST', + headers: { + 'Authorization': _this.basicAuth, + '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 () { + if (res.statusCode === 200) { + // SUCCESS response from openvidu-server. Resolve sessionId + var parsed = JSON.parse(body); + _this.sessionId = parsed.id; + resolve(parsed.id); + } + else { + // ERROR response from openvidu-server. Resolve HTTP status + reject(new Error(res.statusCode)); + } + }); }); + 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: Session.API_TOKENS, - method: 'POST', - headers: { - 'Authorization': this.basicAuth, - 'Content-Type': 'application/json', - 'Content-Length': Buffer.byteLength(requestBody) + 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() + }); } - }; - 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 () { - if (res.statusCode === 200) { - // SUCCESS response from openvidu-server. Resolve token - var parsed = JSON.parse(body); - callback(parsed.id); - } - else { - // ERROR response from openvidu-server. Resolve HTTP status - console.error(res.statusCode); + else { + requestBody = JSON.stringify({ + 'session': _this.sessionId, + 'role': OpenViduRole_1.OpenViduRole.PUBLISHER, + 'data': '' + }); + } + var options = { + hostname: _this.hostname, + port: _this.port, + path: Session.API_TOKENS, + method: 'POST', + headers: { + 'Authorization': _this.basicAuth, + '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 () { + if (res.statusCode === 200) { + // SUCCESS response from openvidu-server. Resolve token + var parsed = JSON.parse(body); + resolve(parsed.id); + } + else { + // ERROR response from openvidu-server. Resolve HTTP status + reject(new Error(res.statusCode)); + } + }); }); + 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 d5bef794..44cce3c3 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 cf97cae0..7316e42a 100644 --- a/openvidu-node-client/src/Session.ts +++ b/openvidu-node-client/src/Session.ts @@ -23,111 +23,111 @@ export class Session { } } - public getSessionId(callback: Function) { + public getSessionId(): Promise { + return new Promise((resolve, reject) => { - if (this.sessionId) { - callback(this.sessionId); - return; - } - - let requestBody = JSON.stringify({ - 'recordingLayout': this.properties.recordingLayout(), - 'recordingMode': this.properties.recordingMode(), - 'mediaMode': this.properties.mediaMode() - }); - - let options = { - hostname: this.hostname, - port: this.port, - path: Session.API_SESSIONS, - method: 'POST', - headers: { - 'Authorization': this.basicAuth, - 'Content-Type': 'application/json', - 'Content-Length': Buffer.byteLength(requestBody) + 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', () => { - if (res.statusCode === 200) { - // SUCCESS response from openvidu-server. Resolve sessionId - let parsed = JSON.parse(body); - this.sessionId = parsed.id; - callback(parsed.id); - } else { - // ERROR response from openvidu-server. Resolve HTTP status - console.error(res.statusCode); - } - }); - }); - req.on('error', (e) => { - console.error(e); + let requestBody = JSON.stringify({ + 'recordingLayout': this.properties.recordingLayout(), + 'recordingMode': this.properties.recordingMode(), + 'mediaMode': this.properties.mediaMode() + }); + + let options = { + hostname: this.hostname, + port: this.port, + path: Session.API_SESSIONS, + method: 'POST', + headers: { + 'Authorization': this.basicAuth, + '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', () => { + if (res.statusCode === 200) { + // SUCCESS response from openvidu-server. Resolve sessionId + let parsed = JSON.parse(body); + this.sessionId = parsed.id; + resolve(parsed.id); + } else { + // ERROR response from openvidu-server. Resolve HTTP status + reject(new Error(res.statusCode)); + } + }); + }); + + req.on('error', (e) => { + reject(e); + }); + req.write(requestBody); + req.end(); }); - req.write(requestBody); - req.end(); } - public generateToken(callback: Function); - public generateToken(tokenOptions: TokenOptions, callback: Function); + public generateToken(tokenOptions?: TokenOptions): Promise { + return new Promise((resolve, reject) => { - public generateToken(tokenOptions: any, callback?: any) { - let requestBody; + 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: Session.API_TOKENS, - method: 'POST', - headers: { - 'Authorization': this.basicAuth, - 'Content-Type': 'application/json', - 'Content-Length': Buffer.byteLength(requestBody) + 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': '' + }); } - }; - const req = https.request(options, (res) => { - let body = ''; - res.on('data', (d) => { - // Continuously update stream with data - body += d; - }); - res.on('end', () => { - if (res.statusCode === 200) { - // SUCCESS response from openvidu-server. Resolve token - let parsed = JSON.parse(body); - callback(parsed.id); - } else { - // ERROR response from openvidu-server. Resolve HTTP status - console.error(res.statusCode); - } - }); - }); - req.on('error', (e) => { - console.error(e); + let options = { + hostname: this.hostname, + port: this.port, + path: Session.API_TOKENS, + method: 'POST', + headers: { + 'Authorization': this.basicAuth, + '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', () => { + if (res.statusCode === 200) { + // SUCCESS response from openvidu-server. Resolve token + let parsed = JSON.parse(body); + resolve(parsed.id); + } else { + // ERROR response from openvidu-server. Resolve HTTP status + reject(new Error(res.statusCode)); + } + }); + }); + + req.on('error', (e) => { + reject(e); + }); + req.write(requestBody); + req.end(); }); - req.write(requestBody); - req.end(); } public getProperties(): SessionProperties { diff --git a/openvidu-testapp/src/app/services/openvidu-rest.service.ts b/openvidu-testapp/src/app/services/openvidu-rest.service.ts index ac16f37a..56a2ebb5 100644 --- a/openvidu-testapp/src/app/services/openvidu-rest.service.ts +++ b/openvidu-testapp/src/app/services/openvidu-rest.service.ts @@ -20,12 +20,15 @@ export class OpenviduRestService { const OV = new OpenViduAPI(openviduURL, openviduSecret); const session = OV.createSession(sessionProperties); - return new Promise(resolve => { - session.getSessionId((sessionId) => { - this.sessionIdSession.set(sessionId, session); - this.sessionIdTokenOpenViduRole.set(sessionId, new Map()); - resolve(sessionId); - }); + return new Promise((resolve, reject) => { + session.getSessionId() + .then(sessionId => { + this.sessionIdSession.set(sessionId, session); + this.sessionIdTokenOpenViduRole.set(sessionId, new Map()); + resolve(sessionId); + }).catch(error => { + reject(error); + }); }); } @@ -33,15 +36,18 @@ export class OpenviduRestService { const session: SessionAPI = this.sessionIdSession.get(sessionId); const OVRole: OpenViduRoleAPI = OpenViduRoleAPI[role]; - return new Promise(resolve => { + return new Promise((resolve, reject) => { const tokenOptions: TokenOptionsAPI = new TokenOptionsAPI.Builder() .role(OVRole) .data(serverData) .build(); - session.generateToken(tokenOptions, (token) => { - this.sessionIdTokenOpenViduRole.get(sessionId).set(token, OVRole); - resolve(token); - }); + session.generateToken(tokenOptions) + .then(token => { + this.sessionIdTokenOpenViduRole.get(sessionId).set(token, OVRole); + resolve(token); + }).catch(error => { + reject(error); + }); }); }