From 7da398eae89d1ccfdc99308eb88f7b43a2c9a9f9 Mon Sep 17 00:00:00 2001 From: Josh Wulf Date: Wed, 11 Dec 2019 02:39:37 +1000 Subject: [PATCH 1/3] Support https for projections --- src/projections/projectionsClient.js | 385 +++++++++++++++++++++------ 1 file changed, 300 insertions(+), 85 deletions(-) diff --git a/src/projections/projectionsClient.js b/src/projections/projectionsClient.js index ec86743..7579eab 100644 --- a/src/projections/projectionsClient.js +++ b/src/projections/projectionsClient.js @@ -1,7 +1,8 @@ -const http = require('http'); -const url = require('url'); -const util = require('util'); -const ProjectionCommandFailedError = require('../errors/projectionCommandFailedError'); +const https = require("https"); +const http = require("http"); +const url = require("url"); +const util = require("util"); +const ProjectionCommandFailedError = require("../errors/projectionCommandFailedError"); const HTTP_OK = 200; const HTTP_CREATED = 201; @@ -9,7 +10,7 @@ const HTTP_CREATED = 201; function safeParseJson(json) { try { return JSON.parse(json); - } catch(e) { + } catch (e) { return null; } } @@ -19,132 +20,324 @@ function ProjectionsClient(log, operationTimeout) { this._operationTimeout = operationTimeout; } -ProjectionsClient.prototype.enable = function(httpEndPoint, name, userCredentials) { - return this.sendPost(httpEndPoint + '/projection/' + name + '/command/enable', '', userCredentials, HTTP_OK); +ProjectionsClient.prototype.enable = function( + httpEndPoint, + name, + userCredentials +) { + return this.sendPost( + httpEndPoint + "/projection/" + name + "/command/enable", + "", + userCredentials, + HTTP_OK + ); }; -ProjectionsClient.prototype.disable = function(httpEndPoint, name, userCredentials) { - return this.sendPost(httpEndPoint + '/projection/' + name + '/command/disable', '', userCredentials, HTTP_OK); +ProjectionsClient.prototype.disable = function( + httpEndPoint, + name, + userCredentials +) { + return this.sendPost( + httpEndPoint + "/projection/" + name + "/command/disable", + "", + userCredentials, + HTTP_OK + ); }; -ProjectionsClient.prototype.abort = function(httpEndPoint, name, userCredentials) { - return this.sendPost(httpEndPoint + '/projection/' + name + '/command/abort', '', userCredentials, HTTP_OK); +ProjectionsClient.prototype.abort = function( + httpEndPoint, + name, + userCredentials +) { + return this.sendPost( + httpEndPoint + "/projection/" + name + "/command/abort", + "", + userCredentials, + HTTP_OK + ); }; -ProjectionsClient.prototype.reset = function(httpEndPoint, name, userCredentials) { - return this.sendPost(httpEndPoint + '/projection/' + name + '/command/reset', '', userCredentials, HTTP_OK); +ProjectionsClient.prototype.reset = function( + httpEndPoint, + name, + userCredentials +) { + return this.sendPost( + httpEndPoint + "/projection/" + name + "/command/reset", + "", + userCredentials, + HTTP_OK + ); }; -ProjectionsClient.prototype.createOneTime = function(httpEndPoint, query, userCredentials) { - return this.sendPost(httpEndPoint + '/projections/onetime?type=JS', query, userCredentials, HTTP_CREATED); +ProjectionsClient.prototype.createOneTime = function( + httpEndPoint, + query, + userCredentials +) { + return this.sendPost( + httpEndPoint + "/projections/onetime?type=JS", + query, + userCredentials, + HTTP_CREATED + ); }; -ProjectionsClient.prototype.createTransient = function(httpEndPoint, name, query, userCredentials) { - return this.sendPost(httpEndPoint + '/projections/transient?name=' + name + '&type=JS', query, userCredentials, HTTP_CREATED); +ProjectionsClient.prototype.createTransient = function( + httpEndPoint, + name, + query, + userCredentials +) { + return this.sendPost( + httpEndPoint + "/projections/transient?name=" + name + "&type=JS", + query, + userCredentials, + HTTP_CREATED + ); }; -ProjectionsClient.prototype.createContinuous = function(httpEndPoint, name, query, trackEmittedStreams, userCredentials) { - return this.sendPost(httpEndPoint + '/projections/continuous?name=' + name + '&type=JS&emit=1&trackemittedstreams=' + trackEmittedStreams, query, userCredentials, HTTP_CREATED); +ProjectionsClient.prototype.createContinuous = function( + httpEndPoint, + name, + query, + trackEmittedStreams, + userCredentials +) { + return this.sendPost( + httpEndPoint + + "/projections/continuous?name=" + + name + + "&type=JS&emit=1&trackemittedstreams=" + + trackEmittedStreams, + query, + userCredentials, + HTTP_CREATED + ); }; ProjectionsClient.prototype.listAll = function(httpEndPoint, userCredentials) { - return this.sendGet(httpEndPoint + '/projections/any', userCredentials, HTTP_OK) - .then(function (json) { - var r = safeParseJson(json); - if (r && r.projections) return r.projections; - return null; - }); + return this.sendGet( + httpEndPoint + "/projections/any", + userCredentials, + HTTP_OK + ).then(function(json) { + var r = safeParseJson(json); + if (r && r.projections) return r.projections; + return null; + }); }; -ProjectionsClient.prototype.listOneTime = function(httpEndPoint, userCredentials) { - return this.sendGet(httpEndPoint + '/projections/onetime', userCredentials, HTTP_OK) - .then(function (json) { - var r = safeParseJson(json); - if (r && r.projections) return r.projections; - return null; - }); +ProjectionsClient.prototype.listOneTime = function( + httpEndPoint, + userCredentials +) { + return this.sendGet( + httpEndPoint + "/projections/onetime", + userCredentials, + HTTP_OK + ).then(function(json) { + var r = safeParseJson(json); + if (r && r.projections) return r.projections; + return null; + }); }; -ProjectionsClient.prototype.listContinuous = function(httpEndPoint, userCredentials) { - return this.sendGet(httpEndPoint + '/projections/continuous', userCredentials, HTTP_OK) - .then(function (json) { - var r = safeParseJson(json); - if (r && r.projections) return r.projections; - return null; - }); +ProjectionsClient.prototype.listContinuous = function( + httpEndPoint, + userCredentials +) { + return this.sendGet( + httpEndPoint + "/projections/continuous", + userCredentials, + HTTP_OK + ).then(function(json) { + var r = safeParseJson(json); + if (r && r.projections) return r.projections; + return null; + }); }; -ProjectionsClient.prototype.getStatus = function(httpEndPoint, name, userCredentials) { - return this.sendGet(httpEndPoint + '/projection/' + name, userCredentials, HTTP_OK); +ProjectionsClient.prototype.getStatus = function( + httpEndPoint, + name, + userCredentials +) { + return this.sendGet( + httpEndPoint + "/projection/" + name, + userCredentials, + HTTP_OK + ); }; -ProjectionsClient.prototype.getState = function(httpEndPoint, name, userCredentials) { - return this.sendGet(httpEndPoint + '/projection/' + name + '/state', userCredentials, HTTP_OK); +ProjectionsClient.prototype.getState = function( + httpEndPoint, + name, + userCredentials +) { + return this.sendGet( + httpEndPoint + "/projection/" + name + "/state", + userCredentials, + HTTP_OK + ); }; -ProjectionsClient.prototype.getPartitionState = function(httpEndPoint, name, partitionId, userCredentials) { - return this.sendGet(httpEndPoint + '/projection/' + name + '/state?partition=' + partitionId, userCredentials, HTTP_OK); +ProjectionsClient.prototype.getPartitionState = function( + httpEndPoint, + name, + partitionId, + userCredentials +) { + return this.sendGet( + httpEndPoint + "/projection/" + name + "/state?partition=" + partitionId, + userCredentials, + HTTP_OK + ); }; -ProjectionsClient.prototype.getResult = function(httpEndPoint, name, userCredentials) { - return this.sendGet(httpEndPoint + '/projection/' + name + '/result', userCredentials, HTTP_OK); +ProjectionsClient.prototype.getResult = function( + httpEndPoint, + name, + userCredentials +) { + return this.sendGet( + httpEndPoint + "/projection/" + name + "/result", + userCredentials, + HTTP_OK + ); }; -ProjectionsClient.prototype.getPartitionResult = function(httpEndPoint, name, partitionId, userCredentials) { - return this.sendGet(httpEndPoint + '/projection/' + name + '/result?partition=' + partitionId, userCredentials, HTTP_OK); +ProjectionsClient.prototype.getPartitionResult = function( + httpEndPoint, + name, + partitionId, + userCredentials +) { + return this.sendGet( + httpEndPoint + "/projection/" + name + "/result?partition=" + partitionId, + userCredentials, + HTTP_OK + ); }; -ProjectionsClient.prototype.getStatistics = function(httpEndPoint, name, userCredentials) { - return this.sendGet(httpEndPoint + '/projection/' + name + '/statistics', userCredentials, HTTP_OK); +ProjectionsClient.prototype.getStatistics = function( + httpEndPoint, + name, + userCredentials +) { + return this.sendGet( + httpEndPoint + "/projection/" + name + "/statistics", + userCredentials, + HTTP_OK + ); }; -ProjectionsClient.prototype.getQuery = function(httpEndPoint, name, userCredentials) { - return this.sendGet(httpEndPoint + '/projection/' + name + '/query', userCredentials, HTTP_OK); +ProjectionsClient.prototype.getQuery = function( + httpEndPoint, + name, + userCredentials +) { + return this.sendGet( + httpEndPoint + "/projection/" + name + "/query", + userCredentials, + HTTP_OK + ); }; -ProjectionsClient.prototype.updateQuery = function(httpEndPoint, name, query, userCredentials) { - return this.sendPut(httpEndPoint + '/projection/' + name + '/query?type=JS', query, userCredentials, HTTP_OK); +ProjectionsClient.prototype.updateQuery = function( + httpEndPoint, + name, + query, + userCredentials +) { + return this.sendPut( + httpEndPoint + "/projection/" + name + "/query?type=JS", + query, + userCredentials, + HTTP_OK + ); }; -ProjectionsClient.prototype.delete = function(httpEndPoint, name, deleteEmittedStreams, deleteStateStream, deleteCheckpointStream, userCredentials) { - return this.sendDelete(httpEndPoint + '/projection/' + name + '?deleteStateStream=' + deleteStateStream + '&deleteCheckpointStream=' + deleteCheckpointStream + '&deleteEmittedStreams=' + deleteEmittedStreams, '', userCredentials, HTTP_OK); +ProjectionsClient.prototype.delete = function( + httpEndPoint, + name, + deleteEmittedStreams, + deleteStateStream, + deleteCheckpointStream, + userCredentials +) { + return this.sendDelete( + httpEndPoint + + "/projection/" + + name + + "?deleteStateStream=" + + deleteStateStream + + "&deleteCheckpointStream=" + + deleteCheckpointStream + + "&deleteEmittedStreams=" + + deleteEmittedStreams, + "", + userCredentials, + HTTP_OK + ); }; -ProjectionsClient.prototype.request = function(method, _url, data, userCredentials, expectedCode) { +ProjectionsClient.prototype.request = function( + method, + _url, + data, + userCredentials, + expectedCode +) { const options = url.parse(_url); + const httplib = options.protocol === "https" ? https : http; options.method = method; if (userCredentials) { - options.auth = [userCredentials.username, userCredentials.password].join(':'); + options.auth = [userCredentials.username, userCredentials.password].join( + ":" + ); } var self = this; - return new Promise(function (resolve, reject) { - const timeout = setTimeout(function () { - reject(new Error(util.format('Request timed out for %s on %s', method, _url))) + return new Promise(function(resolve, reject) { + const timeout = setTimeout(function() { + reject( + new Error(util.format("Request timed out for %s on %s", method, _url)) + ); }, self._operationTimeout); - const req = http.request(options, function (res) { + const req = httplib.request(options, function(res) { const hasExpectedCode = res.statusCode === expectedCode; - var result = ''; - res.setEncoding('utf8'); - res.on('data', function (chunk) { + var result = ""; + res.setEncoding("utf8"); + res.on("data", function(chunk) { result += chunk; }); - res.on('end', function () { + res.on("end", function() { if (hasExpectedCode) { clearTimeout(timeout); resolve(result); } else { clearTimeout(timeout); - reject(new ProjectionCommandFailedError( - res.statusCode, - util.format('Server returned %d (%s) for %s on %s', res.statusCode, res.statusMessage, method, _url) - )); + reject( + new ProjectionCommandFailedError( + res.statusCode, + util.format( + "Server returned %d (%s) for %s on %s", + res.statusCode, + res.statusMessage, + method, + _url + ) + ) + ); } }); }); - req.on('error', reject); + req.on("error", reject); if (data) { - req.setHeader('Content-Length', data.length); - req.setHeader('Content-Type', 'application/json'); + req.setHeader("Content-Length", data.length); + req.setHeader("Content-Type", "application/json"); req.write(data); } req.end(); @@ -153,23 +346,45 @@ ProjectionsClient.prototype.request = function(method, _url, data, userCredentia function voidResult() {} -ProjectionsClient.prototype.sendGet = function(_url, userCredentials, expectedCode) { - return this.request('GET', _url, null, userCredentials, expectedCode); +ProjectionsClient.prototype.sendGet = function( + _url, + userCredentials, + expectedCode +) { + return this.request("GET", _url, null, userCredentials, expectedCode); }; -ProjectionsClient.prototype.sendPost = function(_url, data, userCredentials, expectedCode) { - return this.request('POST', _url, data, userCredentials, expectedCode) - .then(voidResult); +ProjectionsClient.prototype.sendPost = function( + _url, + data, + userCredentials, + expectedCode +) { + return this.request("POST", _url, data, userCredentials, expectedCode).then( + voidResult + ); }; -ProjectionsClient.prototype.sendPut = function(_url, data, userCredentials, expectedCode) { - return this.request('PUT', _url, data, userCredentials, expectedCode) - .then(voidResult); +ProjectionsClient.prototype.sendPut = function( + _url, + data, + userCredentials, + expectedCode +) { + return this.request("PUT", _url, data, userCredentials, expectedCode).then( + voidResult + ); }; -ProjectionsClient.prototype.sendDelete = function(_url, data, userCredentials, expectedCode) { - return this.request('DELETE', _url, data, userCredentials, expectedCode) - .then(voidResult); +ProjectionsClient.prototype.sendDelete = function( + _url, + data, + userCredentials, + expectedCode +) { + return this.request("DELETE", _url, data, userCredentials, expectedCode).then( + voidResult + ); }; module.exports = ProjectionsClient; From 6b75d241fc51e3650cfeb5a3f3f7f94409eea00e Mon Sep 17 00:00:00 2001 From: Josh Wulf Date: Wed, 11 Dec 2019 02:47:41 +1000 Subject: [PATCH 2/3] Support https for projections --- src/projections/projectionsClient.js | 387 ++++++--------------------- 1 file changed, 87 insertions(+), 300 deletions(-) diff --git a/src/projections/projectionsClient.js b/src/projections/projectionsClient.js index 7579eab..c4045e4 100644 --- a/src/projections/projectionsClient.js +++ b/src/projections/projectionsClient.js @@ -1,8 +1,8 @@ -const https = require("https"); -const http = require("http"); -const url = require("url"); -const util = require("util"); -const ProjectionCommandFailedError = require("../errors/projectionCommandFailedError"); +const http = require('http'); +const https = require('https'); +const url = require('url'); +const util = require('util'); +const ProjectionCommandFailedError = require('../errors/projectionCommandFailedError'); const HTTP_OK = 200; const HTTP_CREATED = 201; @@ -10,7 +10,7 @@ const HTTP_CREATED = 201; function safeParseJson(json) { try { return JSON.parse(json); - } catch (e) { + } catch(e) { return null; } } @@ -20,324 +20,133 @@ function ProjectionsClient(log, operationTimeout) { this._operationTimeout = operationTimeout; } -ProjectionsClient.prototype.enable = function( - httpEndPoint, - name, - userCredentials -) { - return this.sendPost( - httpEndPoint + "/projection/" + name + "/command/enable", - "", - userCredentials, - HTTP_OK - ); +ProjectionsClient.prototype.enable = function(httpEndPoint, name, userCredentials) { + return this.sendPost(httpEndPoint + '/projection/' + name + '/command/enable', '', userCredentials, HTTP_OK); }; -ProjectionsClient.prototype.disable = function( - httpEndPoint, - name, - userCredentials -) { - return this.sendPost( - httpEndPoint + "/projection/" + name + "/command/disable", - "", - userCredentials, - HTTP_OK - ); +ProjectionsClient.prototype.disable = function(httpEndPoint, name, userCredentials) { + return this.sendPost(httpEndPoint + '/projection/' + name + '/command/disable', '', userCredentials, HTTP_OK); }; -ProjectionsClient.prototype.abort = function( - httpEndPoint, - name, - userCredentials -) { - return this.sendPost( - httpEndPoint + "/projection/" + name + "/command/abort", - "", - userCredentials, - HTTP_OK - ); +ProjectionsClient.prototype.abort = function(httpEndPoint, name, userCredentials) { + return this.sendPost(httpEndPoint + '/projection/' + name + '/command/abort', '', userCredentials, HTTP_OK); }; -ProjectionsClient.prototype.reset = function( - httpEndPoint, - name, - userCredentials -) { - return this.sendPost( - httpEndPoint + "/projection/" + name + "/command/reset", - "", - userCredentials, - HTTP_OK - ); +ProjectionsClient.prototype.reset = function(httpEndPoint, name, userCredentials) { + return this.sendPost(httpEndPoint + '/projection/' + name + '/command/reset', '', userCredentials, HTTP_OK); }; -ProjectionsClient.prototype.createOneTime = function( - httpEndPoint, - query, - userCredentials -) { - return this.sendPost( - httpEndPoint + "/projections/onetime?type=JS", - query, - userCredentials, - HTTP_CREATED - ); +ProjectionsClient.prototype.createOneTime = function(httpEndPoint, query, userCredentials) { + return this.sendPost(httpEndPoint + '/projections/onetime?type=JS', query, userCredentials, HTTP_CREATED); }; -ProjectionsClient.prototype.createTransient = function( - httpEndPoint, - name, - query, - userCredentials -) { - return this.sendPost( - httpEndPoint + "/projections/transient?name=" + name + "&type=JS", - query, - userCredentials, - HTTP_CREATED - ); +ProjectionsClient.prototype.createTransient = function(httpEndPoint, name, query, userCredentials) { + return this.sendPost(httpEndPoint + '/projections/transient?name=' + name + '&type=JS', query, userCredentials, HTTP_CREATED); }; -ProjectionsClient.prototype.createContinuous = function( - httpEndPoint, - name, - query, - trackEmittedStreams, - userCredentials -) { - return this.sendPost( - httpEndPoint + - "/projections/continuous?name=" + - name + - "&type=JS&emit=1&trackemittedstreams=" + - trackEmittedStreams, - query, - userCredentials, - HTTP_CREATED - ); +ProjectionsClient.prototype.createContinuous = function(httpEndPoint, name, query, trackEmittedStreams, userCredentials) { + return this.sendPost(httpEndPoint + '/projections/continuous?name=' + name + '&type=JS&emit=1&trackemittedstreams=' + trackEmittedStreams, query, userCredentials, HTTP_CREATED); }; ProjectionsClient.prototype.listAll = function(httpEndPoint, userCredentials) { - return this.sendGet( - httpEndPoint + "/projections/any", - userCredentials, - HTTP_OK - ).then(function(json) { - var r = safeParseJson(json); - if (r && r.projections) return r.projections; - return null; - }); + return this.sendGet(httpEndPoint + '/projections/any', userCredentials, HTTP_OK) + .then(function (json) { + var r = safeParseJson(json); + if (r && r.projections) return r.projections; + return null; + }); }; -ProjectionsClient.prototype.listOneTime = function( - httpEndPoint, - userCredentials -) { - return this.sendGet( - httpEndPoint + "/projections/onetime", - userCredentials, - HTTP_OK - ).then(function(json) { - var r = safeParseJson(json); - if (r && r.projections) return r.projections; - return null; - }); +ProjectionsClient.prototype.listOneTime = function(httpEndPoint, userCredentials) { + return this.sendGet(httpEndPoint + '/projections/onetime', userCredentials, HTTP_OK) + .then(function (json) { + var r = safeParseJson(json); + if (r && r.projections) return r.projections; + return null; + }); }; -ProjectionsClient.prototype.listContinuous = function( - httpEndPoint, - userCredentials -) { - return this.sendGet( - httpEndPoint + "/projections/continuous", - userCredentials, - HTTP_OK - ).then(function(json) { - var r = safeParseJson(json); - if (r && r.projections) return r.projections; - return null; - }); +ProjectionsClient.prototype.listContinuous = function(httpEndPoint, userCredentials) { + return this.sendGet(httpEndPoint + '/projections/continuous', userCredentials, HTTP_OK) + .then(function (json) { + var r = safeParseJson(json); + if (r && r.projections) return r.projections; + return null; + }); }; -ProjectionsClient.prototype.getStatus = function( - httpEndPoint, - name, - userCredentials -) { - return this.sendGet( - httpEndPoint + "/projection/" + name, - userCredentials, - HTTP_OK - ); +ProjectionsClient.prototype.getStatus = function(httpEndPoint, name, userCredentials) { + return this.sendGet(httpEndPoint + '/projection/' + name, userCredentials, HTTP_OK); }; -ProjectionsClient.prototype.getState = function( - httpEndPoint, - name, - userCredentials -) { - return this.sendGet( - httpEndPoint + "/projection/" + name + "/state", - userCredentials, - HTTP_OK - ); +ProjectionsClient.prototype.getState = function(httpEndPoint, name, userCredentials) { + return this.sendGet(httpEndPoint + '/projection/' + name + '/state', userCredentials, HTTP_OK); }; -ProjectionsClient.prototype.getPartitionState = function( - httpEndPoint, - name, - partitionId, - userCredentials -) { - return this.sendGet( - httpEndPoint + "/projection/" + name + "/state?partition=" + partitionId, - userCredentials, - HTTP_OK - ); +ProjectionsClient.prototype.getPartitionState = function(httpEndPoint, name, partitionId, userCredentials) { + return this.sendGet(httpEndPoint + '/projection/' + name + '/state?partition=' + partitionId, userCredentials, HTTP_OK); }; -ProjectionsClient.prototype.getResult = function( - httpEndPoint, - name, - userCredentials -) { - return this.sendGet( - httpEndPoint + "/projection/" + name + "/result", - userCredentials, - HTTP_OK - ); +ProjectionsClient.prototype.getResult = function(httpEndPoint, name, userCredentials) { + return this.sendGet(httpEndPoint + '/projection/' + name + '/result', userCredentials, HTTP_OK); }; -ProjectionsClient.prototype.getPartitionResult = function( - httpEndPoint, - name, - partitionId, - userCredentials -) { - return this.sendGet( - httpEndPoint + "/projection/" + name + "/result?partition=" + partitionId, - userCredentials, - HTTP_OK - ); +ProjectionsClient.prototype.getPartitionResult = function(httpEndPoint, name, partitionId, userCredentials) { + return this.sendGet(httpEndPoint + '/projection/' + name + '/result?partition=' + partitionId, userCredentials, HTTP_OK); }; -ProjectionsClient.prototype.getStatistics = function( - httpEndPoint, - name, - userCredentials -) { - return this.sendGet( - httpEndPoint + "/projection/" + name + "/statistics", - userCredentials, - HTTP_OK - ); +ProjectionsClient.prototype.getStatistics = function(httpEndPoint, name, userCredentials) { + return this.sendGet(httpEndPoint + '/projection/' + name + '/statistics', userCredentials, HTTP_OK); }; -ProjectionsClient.prototype.getQuery = function( - httpEndPoint, - name, - userCredentials -) { - return this.sendGet( - httpEndPoint + "/projection/" + name + "/query", - userCredentials, - HTTP_OK - ); +ProjectionsClient.prototype.getQuery = function(httpEndPoint, name, userCredentials) { + return this.sendGet(httpEndPoint + '/projection/' + name + '/query', userCredentials, HTTP_OK); }; -ProjectionsClient.prototype.updateQuery = function( - httpEndPoint, - name, - query, - userCredentials -) { - return this.sendPut( - httpEndPoint + "/projection/" + name + "/query?type=JS", - query, - userCredentials, - HTTP_OK - ); +ProjectionsClient.prototype.updateQuery = function(httpEndPoint, name, query, userCredentials) { + return this.sendPut(httpEndPoint + '/projection/' + name + '/query?type=JS', query, userCredentials, HTTP_OK); }; -ProjectionsClient.prototype.delete = function( - httpEndPoint, - name, - deleteEmittedStreams, - deleteStateStream, - deleteCheckpointStream, - userCredentials -) { - return this.sendDelete( - httpEndPoint + - "/projection/" + - name + - "?deleteStateStream=" + - deleteStateStream + - "&deleteCheckpointStream=" + - deleteCheckpointStream + - "&deleteEmittedStreams=" + - deleteEmittedStreams, - "", - userCredentials, - HTTP_OK - ); +ProjectionsClient.prototype.delete = function(httpEndPoint, name, deleteEmittedStreams, deleteStateStream, deleteCheckpointStream, userCredentials) { + return this.sendDelete(httpEndPoint + '/projection/' + name + '?deleteStateStream=' + deleteStateStream + '&deleteCheckpointStream=' + deleteCheckpointStream + '&deleteEmittedStreams=' + deleteEmittedStreams, '', userCredentials, HTTP_OK); }; -ProjectionsClient.prototype.request = function( - method, - _url, - data, - userCredentials, - expectedCode -) { +ProjectionsClient.prototype.request = function(method, _url, data, userCredentials, expectedCode) { const options = url.parse(_url); - const httplib = options.protocol === "https" ? https : http; + const httplib = options.protocol === 'https' ? https : http; options.method = method; if (userCredentials) { - options.auth = [userCredentials.username, userCredentials.password].join( - ":" - ); + options.auth = [userCredentials.username, userCredentials.password].join(':'); } var self = this; - return new Promise(function(resolve, reject) { - const timeout = setTimeout(function() { - reject( - new Error(util.format("Request timed out for %s on %s", method, _url)) - ); + return new Promise(function (resolve, reject) { + const timeout = setTimeout(function () { + reject(new Error(util.format('Request timed out for %s on %s', method, _url))) }, self._operationTimeout); - const req = httplib.request(options, function(res) { + const req = httplib.request(options, function (res) { const hasExpectedCode = res.statusCode === expectedCode; - var result = ""; - res.setEncoding("utf8"); - res.on("data", function(chunk) { + var result = ''; + res.setEncoding('utf8'); + res.on('data', function (chunk) { result += chunk; }); - res.on("end", function() { + res.on('end', function () { if (hasExpectedCode) { clearTimeout(timeout); resolve(result); } else { clearTimeout(timeout); - reject( - new ProjectionCommandFailedError( - res.statusCode, - util.format( - "Server returned %d (%s) for %s on %s", - res.statusCode, - res.statusMessage, - method, - _url - ) - ) - ); + reject(new ProjectionCommandFailedError( + res.statusCode, + util.format('Server returned %d (%s) for %s on %s', res.statusCode, res.statusMessage, method, _url) + )); } }); }); - req.on("error", reject); + req.on('error', reject); if (data) { - req.setHeader("Content-Length", data.length); - req.setHeader("Content-Type", "application/json"); + req.setHeader('Content-Length', data.length); + req.setHeader('Content-Type', 'application/json'); req.write(data); } req.end(); @@ -346,45 +155,23 @@ ProjectionsClient.prototype.request = function( function voidResult() {} -ProjectionsClient.prototype.sendGet = function( - _url, - userCredentials, - expectedCode -) { - return this.request("GET", _url, null, userCredentials, expectedCode); +ProjectionsClient.prototype.sendGet = function(_url, userCredentials, expectedCode) { + return this.request('GET', _url, null, userCredentials, expectedCode); }; -ProjectionsClient.prototype.sendPost = function( - _url, - data, - userCredentials, - expectedCode -) { - return this.request("POST", _url, data, userCredentials, expectedCode).then( - voidResult - ); +ProjectionsClient.prototype.sendPost = function(_url, data, userCredentials, expectedCode) { + return this.request('POST', _url, data, userCredentials, expectedCode) + .then(voidResult); }; -ProjectionsClient.prototype.sendPut = function( - _url, - data, - userCredentials, - expectedCode -) { - return this.request("PUT", _url, data, userCredentials, expectedCode).then( - voidResult - ); +ProjectionsClient.prototype.sendPut = function(_url, data, userCredentials, expectedCode) { + return this.request('PUT', _url, data, userCredentials, expectedCode) + .then(voidResult); }; -ProjectionsClient.prototype.sendDelete = function( - _url, - data, - userCredentials, - expectedCode -) { - return this.request("DELETE", _url, data, userCredentials, expectedCode).then( - voidResult - ); +ProjectionsClient.prototype.sendDelete = function(_url, data, userCredentials, expectedCode) { + return this.request('DELETE', _url, data, userCredentials, expectedCode) + .then(voidResult); }; module.exports = ProjectionsClient; From 7b7ccc2eef0b24bcfb97093365bdee87f3124f70 Mon Sep 17 00:00:00 2001 From: Josh Wulf Date: Wed, 11 Dec 2019 02:54:47 +1000 Subject: [PATCH 3/3] Correct protocol detection --- src/projections/projectionsClient.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/projections/projectionsClient.js b/src/projections/projectionsClient.js index c4045e4..35829cb 100644 --- a/src/projections/projectionsClient.js +++ b/src/projections/projectionsClient.js @@ -113,7 +113,7 @@ ProjectionsClient.prototype.delete = function(httpEndPoint, name, deleteEmittedS ProjectionsClient.prototype.request = function(method, _url, data, userCredentials, expectedCode) { const options = url.parse(_url); - const httplib = options.protocol === 'https' ? https : http; + const httplib = options.protocol === 'https:' ? https : http; options.method = method; if (userCredentials) { options.auth = [userCredentials.username, userCredentials.password].join(':');