Skip to content

Close #15: Added new parameter to HTTP request #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
isacna wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Close #15: Added new parameter to HTTP request #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ webHooks.add('shortname2', 'http://127.0.0.1:9000/prova2/').then(function(){
// trigger a specific webHook
webHooks.trigger('shortname1', {data: 123})
webHooks.trigger('shortname2', {data: 123456}, {header: 'header'}) // payload will be sent as POST request with JSON body (Content-Type: application/json) and custom header
webHooks.trigger('shortname3', {}, {}, "GET") // payload will be sent as GET request

```

Expand Down
1 change: 1 addition & 0 deletions example.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,4 @@ webHooks.add('shortname2', 'http://127.0.0.1:9000/prova2/').then(function () {
// trigger a specific webHook
webHooks.trigger('shortname1', {data: 123})
webHooks.trigger('shortname2', {data: 123456}, {header: 'header'}) // payload will be sent as POST request with JSON body (Content-Type: application/json) and custom header
webHooks.trigger('shortname3', {}, {}, "GET") // payload will be sent as GET request
63 changes: 32 additions & 31 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ var events = require('eventemitter2')
var _functions = {}

// WebHooks Class
function WebHooks (options) {
function WebHooks(options) {
if (typeof options !== 'object') throw new TypeError('Expected an Object')
if (typeof options.db !== 'string' && typeof options.db !== 'object') {
throw new TypeError('db Must be a String path or an object')
Expand Down Expand Up @@ -73,13 +73,13 @@ function WebHooks (options) {
}
}

function _initDB (file) {
function _initDB(file) {
// init DB.
var db = {} // init empty db
jsonfile.writeFileSync(file, db, {spaces: 2})
jsonfile.writeFileSync(file, db, { spaces: 2 })
}

function _setListeners (self) {
function _setListeners(self) {
// set Listeners - sync method

try {
Expand All @@ -106,44 +106,45 @@ function _setListeners (self) {
// console.log(_functions[0] == _functions[2]);
}

function _getRequestFunction (self, url) {
function _getRequestFunction(self, url) {
// return the function then called by the event listener.
var func = function (shortname, jsonData, headersData) { // argument required when eventEmitter.emit()
var obj = {'Content-Type': 'application/json'}
var func = function (shortname, jsonData, headersData, method) { // argument required when eventEmitter.emit()
var obj = { 'Content-Type': 'application/json' }
var headers = headersData ? _.merge(obj, headersData) : obj

debug('POST request to:', url)
// POST request to the instantiated URL with custom headers if provided
request({
method: 'POST',
method: method || 'POST',
uri: url,
strictSSL: false,
headers: headers,
body: JSON.stringify(jsonData)
body: method === "GET" ? null : JSON.stringify(jsonData)
},
function (error, response, body) {
var statusCode = response ? response.statusCode : null
body = body || null
debug('Request sent - Server responded with:', statusCode, body)

if ((error || self.httpSuccessCodes.indexOf(statusCode) === -1)) {
self.emitter.emit(shortname + '.failure', shortname, statusCode, body)
return debug('HTTP failed: ' + error)
}
function (error, response, body) {
var statusCode = response ? response.statusCode : null
response = response ? response.body : null
body = body || null
debug('Request sent - Server responded with:', statusCode, body)

if ((error || self.httpSuccessCodes.indexOf(statusCode) === -1)) {
self.emitter.emit(shortname + '.failure', shortname, statusCode, body, response)
return debug('HTTP failed: ' + error)
}

self.emitter.emit(shortname + '.success', shortname, statusCode, body)
}
)
self.emitter.emit(shortname + '.success', shortname, statusCode, body, response)
}
)
}

return func
}

// 'prototype' has improved performances, let's declare the methods

WebHooks.prototype.trigger = function (shortname, jsonData, headersData) {
WebHooks.prototype.trigger = function (shortname, jsonData, headersData, method) {
// trigger a webHook
this.emitter.emit(shortname, shortname, jsonData, headersData)
this.emitter.emit(shortname, shortname, jsonData, headersData, method)
}

WebHooks.prototype.add = function (shortname, url) { // url is required
Expand All @@ -160,9 +161,9 @@ WebHooks.prototype.add = function (shortname, url) { // url is required
var modified = false
var encUrl
if (obj[shortname]) {
// shortname already exists
// shortname already exists
if (obj[shortname].indexOf(url) === -1) {
// url doesn't exists for given shortname
// url doesn't exists for given shortname
debug('url added to an existing shortname!')
obj[shortname].push(url)
encUrl = crypto.createHash('md5').update(url).digest('hex')
Expand All @@ -171,7 +172,7 @@ WebHooks.prototype.add = function (shortname, url) { // url is required
modified = true
}
} else {
// new shortname
// new shortname
debug('new shortname!')
obj[shortname] = [url]
encUrl = crypto.createHash('md5').update(url).digest('hex')
Expand All @@ -180,7 +181,7 @@ WebHooks.prototype.add = function (shortname, url) { // url is required
modified = true
}

// actualize DB
// actualize DB
if (modified) {
if (!self.isMemDb) jsonfile.writeFileSync(self.db, obj)
resolve(true)
Expand Down Expand Up @@ -243,7 +244,7 @@ WebHooks.prototype.remove = function (shortname, url) { // url is optional
})
}

function _removeUrlFromShortname (self, shortname, url, callback) {
function _removeUrlFromShortname(self, shortname, url, callback) {
try {
var obj = self.isMemDb ? self.db : jsonfile.readFileSync(self.db)

Expand All @@ -253,7 +254,7 @@ function _removeUrlFromShortname (self, shortname, url, callback) {
obj[shortname].splice(obj[shortname].indexOf(url), 1)
}
if (obj[shortname].length !== len) deleted = true
// save it back to the DB
// save it back to the DB
if (deleted) {
if (!self.isMemDb) jsonfile.writeFileSync(self.db, obj)
debug('url removed from existing shortname')
Expand All @@ -264,7 +265,7 @@ function _removeUrlFromShortname (self, shortname, url, callback) {
}
}

function _removeShortname (self, shortname, callback) {
function _removeShortname(self, shortname, callback) {
try {
var obj = self.isMemDb ? self.db : jsonfile.readFileSync(self.db)
delete obj[shortname]
Expand Down
Loading