diff --git a/src/bridges/GitterBridge.ts b/src/bridges/GitterBridge.ts index 398c901..1589d31 100644 --- a/src/bridges/GitterBridge.ts +++ b/src/bridges/GitterBridge.ts @@ -140,21 +140,26 @@ export class GitterBridge { qs: qs, json: body, }, (err, res, _body) => { - if (err) { - LogService.error("GitterBridge", "Error calling " + url); - LogService.error("GitterBridge", err); - reject(err); - } else if (!res) { - LogService.error("GitterBridge", "There is no response for " + url); - reject(new Error("No response provided - is the service online?")); - } else if (res.statusCode !== 200) { - if (typeof(res.body) === "string") res.body = JSON.parse(res.body); - LogService.error("GitterBridge", "Got status code " + res.statusCode + " when calling " + url); - LogService.error("GitterBridge", res.body); - reject({body: res.body, status: res.statusCode}); - } else { - if (typeof(res.body) === "string") res.body = JSON.parse(res.body); - resolve(res.body); + try { + if (err) { + LogService.error("GitterBridge", "Error calling " + url); + LogService.error("GitterBridge", err); + reject(err); + } else if (!res) { + LogService.error("GitterBridge", "There is no response for " + url); + reject(new Error("No response provided - is the service online?")); + } else if (res.statusCode !== 200) { + if (typeof (res.body) === "string") res.body = JSON.parse(res.body); + LogService.error("GitterBridge", "Got status code " + res.statusCode + " when calling " + url); + LogService.error("GitterBridge", res.body); + reject({body: res.body, status: res.statusCode}); + } else { + if (typeof (res.body) === "string") res.body = JSON.parse(res.body); + resolve(res.body); + } + } catch (e) { + LogService.error("GitterBridge", e); + reject(e); } }); }); @@ -173,21 +178,26 @@ export class GitterBridge { qs: qs, json: body, }, (err, res, _body) => { - if (err) { - LogService.error("GitterBridge", "Error calling" + url); - LogService.error("GitterBridge", err); - reject(err); - } else if (!res) { - LogService.error("GitterBridge", "There is no response for " + url); - reject(new Error("No response provided - is the service online?")); - } else if (res.statusCode !== 200) { - if (typeof(res.body) === "string") res.body = JSON.parse(res.body); - LogService.error("GitterBridge", "Got status code " + res.statusCode + " when calling " + url); - LogService.error("GitterBridge", res.body); - reject({body: res.body, status: res.statusCode}); - } else { - if (typeof(res.body) === "string") res.body = JSON.parse(res.body); - resolve(res.body); + try { + if (err) { + LogService.error("GitterBridge", "Error calling" + url); + LogService.error("GitterBridge", err); + reject(err); + } else if (!res) { + LogService.error("GitterBridge", "There is no response for " + url); + reject(new Error("No response provided - is the service online?")); + } else if (res.statusCode !== 200) { + if (typeof (res.body) === "string") res.body = JSON.parse(res.body); + LogService.error("GitterBridge", "Got status code " + res.statusCode + " when calling " + url); + LogService.error("GitterBridge", res.body); + reject({body: res.body, status: res.statusCode}); + } else { + if (typeof (res.body) === "string") res.body = JSON.parse(res.body); + resolve(res.body); + } + } catch (e) { + LogService.error("GitterBridge", e); + reject(e); } }); }); diff --git a/src/bridges/IrcBridge.ts b/src/bridges/IrcBridge.ts index 925a40c..40fdb52 100644 --- a/src/bridges/IrcBridge.ts +++ b/src/bridges/IrcBridge.ts @@ -281,20 +281,25 @@ export class IrcBridge { qs: qs, json: body, }, (err, res, _body) => { - if (err) { - LogService.error("IrcBridge", "Error calling " + url); - LogService.error("IrcBridge", err); - reject(err); - } else if (!res) { - LogService.error("IrcBridge", "There is no response for " + url); - reject(new Error("No response provided - is the service online?")); - } else if (res.statusCode !== 200) { - LogService.error("IrcBridge", "Got status code " + res.statusCode + " when calling " + url); - LogService.error("IrcBridge", res.body); - reject(new Error("Request failed")); - } else { - if (typeof(res.body) === "string") res.body = JSON.parse(res.body); - resolve(res.body); + try { + if (err) { + LogService.error("IrcBridge", "Error calling " + url); + LogService.error("IrcBridge", err); + reject(err); + } else if (!res) { + LogService.error("IrcBridge", "There is no response for " + url); + reject(new Error("No response provided - is the service online?")); + } else if (res.statusCode !== 200) { + LogService.error("IrcBridge", "Got status code " + res.statusCode + " when calling " + url); + LogService.error("IrcBridge", res.body); + reject(new Error("Request failed")); + } else { + if (typeof (res.body) === "string") res.body = JSON.parse(res.body); + resolve(res.body); + } + } catch (e) { + LogService.error("IrcBridge", e); + reject(e); } }); }); @@ -313,20 +318,25 @@ export class IrcBridge { qs: qs, json: body, }, (err, res, _body) => { - if (err) { - LogService.error("IrcBridge", "Error calling" + url); - LogService.error("IrcBridge", err); - reject(err); - } else if (!res) { - LogService.error("IrcBridge", "There is no response for " + url); - reject(new Error("No response provided - is the service online?")); - } else if (res.statusCode !== 200) { - LogService.error("IrcBridge", "Got status code " + res.statusCode + " when calling " + url); - LogService.error("IrcBridge", res.body); - reject(new Error("Request failed")); - } else { - if (typeof(res.body) === "string") res.body = JSON.parse(res.body); - resolve(res.body); + try { + if (err) { + LogService.error("IrcBridge", "Error calling" + url); + LogService.error("IrcBridge", err); + reject(err); + } else if (!res) { + LogService.error("IrcBridge", "There is no response for " + url); + reject(new Error("No response provided - is the service online?")); + } else if (res.statusCode !== 200) { + LogService.error("IrcBridge", "Got status code " + res.statusCode + " when calling " + url); + LogService.error("IrcBridge", res.body); + reject(new Error("Request failed")); + } else { + if (typeof (res.body) === "string") res.body = JSON.parse(res.body); + resolve(res.body); + } + } catch (e) { + LogService.error("IrcBridge", e); + reject(e); } }); }); diff --git a/src/bridges/SlackBridge.ts b/src/bridges/SlackBridge.ts index d718501..3306d93 100644 --- a/src/bridges/SlackBridge.ts +++ b/src/bridges/SlackBridge.ts @@ -257,21 +257,26 @@ export class SlackBridge { qs: qs, json: body, }, (err, res, _body) => { - if (err) { - LogService.error("SlackBridge", "Error calling " + url); - LogService.error("SlackBridge", err); - reject(err); - } else if (!res) { - LogService.error("SlackBridge", "There is no response for " + url); - reject(new Error("No response provided - is the service online?")); - } else if (res.statusCode !== 200) { - if (typeof(res.body) === "string") res.body = JSON.parse(res.body); - LogService.error("SlackBridge", "Got status code " + res.statusCode + " when calling " + url); - LogService.error("SlackBridge", res.body); - reject({body: res.body, status: res.statusCode}); - } else { - if (typeof(res.body) === "string") res.body = JSON.parse(res.body); - resolve(res.body); + try { + if (err) { + LogService.error("SlackBridge", "Error calling " + url); + LogService.error("SlackBridge", err); + reject(err); + } else if (!res) { + LogService.error("SlackBridge", "There is no response for " + url); + reject(new Error("No response provided - is the service online?")); + } else if (res.statusCode !== 200) { + if (typeof (res.body) === "string") res.body = JSON.parse(res.body); + LogService.error("SlackBridge", "Got status code " + res.statusCode + " when calling " + url); + LogService.error("SlackBridge", res.body); + reject({body: res.body, status: res.statusCode}); + } else { + if (typeof (res.body) === "string") res.body = JSON.parse(res.body); + resolve(res.body); + } + } catch (e) { + LogService.error("SlackBridge", e); + reject(e); } }); }); @@ -290,21 +295,26 @@ export class SlackBridge { qs: qs, json: body, }, (err, res, _body) => { - if (err) { - LogService.error("SlackBridge", "Error calling" + url); - LogService.error("SlackBridge", err); - reject(err); - } else if (!res) { - LogService.error("SlackBridge", "There is no response for " + url); - reject(new Error("No response provided - is the service online?")); - } else if (res.statusCode !== 200) { - if (typeof(res.body) === "string") res.body = JSON.parse(res.body); - LogService.error("SlackBridge", "Got status code " + res.statusCode + " when calling " + url); - LogService.error("SlackBridge", res.body); - reject({body: res.body, status: res.statusCode}); - } else { - if (typeof(res.body) === "string") res.body = JSON.parse(res.body); - resolve(res.body); + try { + if (err) { + LogService.error("SlackBridge", "Error calling" + url); + LogService.error("SlackBridge", err); + reject(err); + } else if (!res) { + LogService.error("SlackBridge", "There is no response for " + url); + reject(new Error("No response provided - is the service online?")); + } else if (res.statusCode !== 200) { + if (typeof (res.body) === "string") res.body = JSON.parse(res.body); + LogService.error("SlackBridge", "Got status code " + res.statusCode + " when calling " + url); + LogService.error("SlackBridge", res.body); + reject({body: res.body, status: res.statusCode}); + } else { + if (typeof (res.body) === "string") res.body = JSON.parse(res.body); + resolve(res.body); + } + } catch (e) { + LogService.error("SlackBridge", e); + reject(e); } }); }); diff --git a/src/bridges/TelegramBridge.ts b/src/bridges/TelegramBridge.ts index 1841865..b88a09c 100644 --- a/src/bridges/TelegramBridge.ts +++ b/src/bridges/TelegramBridge.ts @@ -209,21 +209,26 @@ export class TelegramBridge { "Authorization": `Bearer ${bridge.sharedSecret}`, }, }, (err, res, _body) => { - if (err) { - LogService.error("TelegramBridge", "Error calling" + url); - LogService.error("TelegramBridge", err); - reject(err); - } else if (!res) { - LogService.error("TelegramBridge", "There is no response for " + url); - reject(new Error("No response provided - is the service online?")); - } else if (res.statusCode !== 200 && res.statusCode !== 202) { - LogService.error("TelegramBridge", "Got status code " + res.statusCode + " when calling " + url); - LogService.error("TelegramBridge", res.body); - if (typeof(res.body) === "string") res.body = JSON.parse(res.body); - reject({errBody: res.body, error: new Error("Request failed")}); - } else { - if (typeof(res.body) === "string") res.body = JSON.parse(res.body); - resolve(res.body); + try { + if (err) { + LogService.error("TelegramBridge", "Error calling" + url); + LogService.error("TelegramBridge", err); + reject(err); + } else if (!res) { + LogService.error("TelegramBridge", "There is no response for " + url); + reject(new Error("No response provided - is the service online?")); + } else if (res.statusCode !== 200 && res.statusCode !== 202) { + LogService.error("TelegramBridge", "Got status code " + res.statusCode + " when calling " + url); + LogService.error("TelegramBridge", res.body); + if (typeof (res.body) === "string") res.body = JSON.parse(res.body); + reject({errBody: res.body, error: new Error("Request failed")}); + } else { + if (typeof (res.body) === "string") res.body = JSON.parse(res.body); + resolve(res.body); + } + } catch (e) { + LogService.error("TelegramBridge", e); + reject(e); } }); }); diff --git a/src/bridges/WebhooksBridge.ts b/src/bridges/WebhooksBridge.ts index 3a30849..2450ed7 100644 --- a/src/bridges/WebhooksBridge.ts +++ b/src/bridges/WebhooksBridge.ts @@ -78,20 +78,25 @@ export class WebhooksBridge { qs: qs, json: body, }, (err, res, _body) => { - if (err) { - LogService.error("WebhooksBridge", "Error calling" + url); - LogService.error("WebhooksBridge", err); - reject(err); - } else if (!res) { - LogService.error("WebhooksBridge", "There is no response for " + url); - reject(new Error("No response provided - is the service online?")); - } else if (res.statusCode !== 200) { - LogService.error("WebhooksBridge", "Got status code " + res.statusCode + " when calling " + url); - LogService.error("WebhooksBridge", res.body); - reject(new Error("Request failed")); - } else { - if (typeof(res.body) === "string") res.body = JSON.parse(res.body); - resolve(res.body); + try { + if (err) { + LogService.error("WebhooksBridge", "Error calling" + url); + LogService.error("WebhooksBridge", err); + reject(err); + } else if (!res) { + LogService.error("WebhooksBridge", "There is no response for " + url); + reject(new Error("No response provided - is the service online?")); + } else if (res.statusCode !== 200) { + LogService.error("WebhooksBridge", "Got status code " + res.statusCode + " when calling " + url); + LogService.error("WebhooksBridge", res.body); + reject(new Error("Request failed")); + } else { + if (typeof (res.body) === "string") res.body = JSON.parse(res.body); + resolve(res.body); + } + } catch (e) { + LogService.error("WebhooksBridge", e); + reject(e); } }); });