diff --git a/bbb-webhooks/application.js b/bbb-webhooks/application.js
index e2c0c5424f94f20e5e02911e82311d17fb0edf4e..148979a0516af1740d0cf571bfc5885f2cde5a06 100644
--- a/bbb-webhooks/application.js
+++ b/bbb-webhooks/application.js
@@ -11,7 +11,7 @@ const async = require("async");
// process to perform the callback calls.
// TODO: add port (-p) and log level (-l) to the command line args
module.exports = class Application {
-
+
constructor() {
this.webHooks = new WebHooks();
this.webServer = new WebServer();
@@ -33,7 +33,14 @@ module.exports = class Application {
});
});
}
-
+
+ static redisPubSubClient() {
+ if (!Application._redisPubSubClient) {
+ Application._redisPubSubClient = redis.createClient( { host: config.get("redis.host"), port: config.get("redis.port") } );
+ }
+ return Application._redisPubSubClient;
+ }
+
static redisClient() {
if (!Application._redisClient) {
Application._redisClient = redis.createClient( { host: config.get("redis.host"), port: config.get("redis.port") } );
diff --git a/bbb-webhooks/hook.js b/bbb-webhooks/hook.js
index f15537bb13409332e1fd8673222a9c15e7003c90..21c1c6dceaea2b2eb7cf1aa3b3795e64ae1bbfae 100644
--- a/bbb-webhooks/hook.js
+++ b/bbb-webhooks/hook.js
@@ -36,7 +36,7 @@ module.exports = class Hook {
this.externalMeetingID = null;
this.queue = [];
this.emitter = null;
- this.redisClient = Application.redisClient;
+ this.redisClient = Application.redisClient();
this.permanent = false;
this.getRaw = false;
}
@@ -266,7 +266,7 @@ module.exports = class Hook {
// Gets all hooks from redis to populate the local database.
// Calls `callback()` when done.
static resync(callback) {
- let client = Application.redisClient;
+ let client = Application.redisClient();
// Remove previous permanent hooks
for (let hk = 1; hk <= config.get("hooks.permanentURLs").length; hk++) {
client.srem(config.get("redis.keys.hooks"), hk, (error, reply) => {
diff --git a/bbb-webhooks/id_mapping.js b/bbb-webhooks/id_mapping.js
index f9285d318926a3e7dcbd2b281b36a405422e1030..f409f40a889a689afbf72fad4171e248f3c994bc 100644
--- a/bbb-webhooks/id_mapping.js
+++ b/bbb-webhooks/id_mapping.js
@@ -33,7 +33,7 @@ module.exports = class IDMapping {
this.externalMeetingID = null;
this.internalMeetingID = null;
this.lastActivity = null;
- this.redisClient = Application.redisClient;
+ this.redisClient = Application.redisClient();
}
save(callback) {
@@ -180,7 +180,7 @@ module.exports = class IDMapping {
// Gets all mappings from redis to populate the local database.
// Calls `callback()` when done.
static resync(callback) {
- let client = Application.redisClient;
+ let client = Application.redisClient();
let tasks = [];
return client.smembers(config.get("redis.keys.mappings"), (error, mappings) => {
diff --git a/bbb-webhooks/test/test.js b/bbb-webhooks/test/test.js
index 0e4dfc2f9042f06b95ad000267c7513badafa25f..a44bbeb4ede45a9c39cc38b144ec8f15a0954618 100644
--- a/bbb-webhooks/test/test.js
+++ b/bbb-webhooks/test/test.js
@@ -1,6 +1,5 @@
const request = require('supertest');
const nock = require("nock");
-const Application = require('../application.js');
const Logger = require('../logger.js');
const utils = require('../utils.js');
const config = require('config');
@@ -9,30 +8,34 @@ const Helpers = require('./helpers.js')
const sinon = require('sinon');
const winston = require('winston');
-const sharedSecret = sharedSecret;
+Application = require('../application.js');
+
+const sharedSecret = process.env.SHARED_SECRET || sharedSecret;
+
+let globalHooks = config.get('hooks');
// Block winston from logging
Logger.remove(winston.transports.Console);
describe('bbb-webhooks tests', () => {
before( (done) => {
- config.get(hooks.queueSize) = 10;
- config.get(hooks.permanentURLs) = [ { url: "http://wh.requestcatcher.com", getRaw: true } ];
+ globalHooks.queueSize = 10;
+ globalHooks.permanentURLs = [ { url: "http://wh.requestcatcher.com", getRaw: true } ];
application = new Application();
application.start( () => {
done();
});
});
beforeEach( (done) => {
- hooks = Hook.allGlobalSync();
- Helpers.flushall(Application.redisClient);
+ const hooks = Hook.allGlobalSync();
+ Helpers.flushall(Application.redisClient());
hooks.forEach( hook => {
Helpers.flushredis(hook);
})
done();
})
after( () => {
- hooks = Hook.allGlobalSync();
- Helpers.flushall(Application.redisClient);
+ const hooks = Hook.allGlobalSync();
+ Helpers.flushall(Application.redisClient());
hooks.forEach( hook => {
Helpers.flushredis(hook);
})
@@ -112,7 +115,7 @@ describe('bbb-webhooks tests', () => {
.expect('Content-Type', /text\/xml/)
.expect(200, (res) => {
const hooks = Hook.allGlobalSync();
- if (hooks && hooks[0].callbackURL == config.get(hooks.permanentURLs)[0].url) {
+ if (hooks && hooks[0].callbackURL == globalHooks.permanentURLs[0].url) {
done();
}
else {
@@ -148,7 +151,7 @@ describe('bbb-webhooks tests', () => {
describe('Hook queues', () => {
before( () => {
- config.get(Application.redisClient.psubscribe)("test-channel");
+ Application.redisPubSubClient().psubscribe("test-channel");
Hook.addSubscription(Helpers.callback,null,false, (err,reply) => {
const hooks = Hook.allGlobalSync();
const hook = hooks[0];
@@ -161,13 +164,14 @@ describe('bbb-webhooks tests', () => {
const hooks = Hook.allGlobalSync();
const hook = hooks[0];
const hook2 = hooks[hooks.length -1];
+
hook._processQueue.restore();
hook2._processQueue.restore();
Hook.removeSubscription(hooks[hooks.length-1].id);
- config.get(Application.redisClient.unsubscribe)("test-channel");
+ Application.redisPubSubClient().unsubscribe("test-channel");
});
it('should have different queues for each hook', (done) => {
- config.get(Application.redisClient.publish)("test-channel", JSON.stringify(Helpers.rawMessage));
+ Application.redisClient().publish("test-channel", JSON.stringify(Helpers.rawMessage));
const hooks = Hook.allGlobalSync();
if (hooks && hooks[0].queue != hooks[hooks.length-1].queue) {
@@ -196,7 +200,7 @@ describe('bbb-webhooks tests', () => {
hook = hook[0];
for(i=0;i<=9;i++) { hook.enqueue("message" + i); }
- if (hook && hook.queue.length <= config.get(hooks.queueSize)) {
+ if (hook && hook.queue.length <= globalHooks.queueSize) {
done();
}
else {
@@ -207,7 +211,7 @@ describe('bbb-webhooks tests', () => {
describe('/POST mapped message', () => {
before( () => {
- config.get(Application.redisClient.psubscribe)("test-channel");
+ Application.redisPubSubClient().psubscribe("test-channel");
const hooks = Hook.allGlobalSync();
const hook = hooks[0];
hook.queue = [];
@@ -217,13 +221,13 @@ describe('bbb-webhooks tests', () => {
const hooks = Hook.allGlobalSync();
const hook = hooks[0];
Helpers.flushredis(hook);
- config.get(Application.redisClient.unsubscribe)("test-channel");
+ Application.redisPubSubClient().unsubscribe("test-channel");
})
it('should post mapped message ', (done) => {
const hooks = Hook.allGlobalSync();
const hook = hooks[0];
- const getpost = nock(config.get(hooks.permanentURLs)[0].url)
+ const getpost = nock(globalHooks.permanentURLs[0].url)
.filteringRequestBody( (body) => {
let parsed = JSON.parse(body)
return parsed[0].data.id ? "mapped" : "not mapped";
@@ -232,13 +236,13 @@ describe('bbb-webhooks tests', () => {
.reply(200, (res) => {
done();
});
- config.get(Application.redisClient.publish)("test-channel", JSON.stringify(Helpers.rawMessage));
+ Application.redisClient().publish("test-channel", JSON.stringify(Helpers.rawMessage));
})
});
describe('/POST raw message', () => {
before( () => {
- config.get(Application.redisClient.psubscribe)("test-channel");
+ Application.redisPubSubClient().psubscribe("test-channel");
Hook.addSubscription(Helpers.callback,null,true, (err,hook) => {
Helpers.flushredis(hook);
})
@@ -247,7 +251,7 @@ describe('bbb-webhooks tests', () => {
const hooks = Hook.allGlobalSync();
Hook.removeSubscription(hooks[hooks.length-1].id);
Helpers.flushredis(hooks[hooks.length-1]);
- config.get(Application.redisClient.unsubscribe)("test-channel");
+ Application.redisPubSubClient().unsubscribe("test-channel");
});
it('should post raw message ', (done) => {
const hooks = Hook.allGlobalSync();
@@ -264,10 +268,10 @@ describe('bbb-webhooks tests', () => {
.reply(200, () => {
done();
});
- const permanent = nock(config.get(hooks.permanentURLs)[0].url)
+ const permanent = nock(globalHooks.permanentURLs[0].url)
.post("/")
.reply(200)
- config.get(Application.redisClient.publish)("test-channel", JSON.stringify(Helpers.rawMessage));
+ Application.redisClient().publish("test-channel", JSON.stringify(Helpers.rawMessage));
})
});
@@ -282,7 +286,7 @@ describe('bbb-webhooks tests', () => {
const hooks = Hook.allGlobalSync();
const hook = hooks[0];
hook.enqueue("multiMessage2")
- const getpost = nock(config.get(hooks.permanentURLs)[0].url)
+ const getpost = nock(globalHooks.permanentURLs[0].url)
.filteringPath( (path) => {
return path.split('?')[0];
})
diff --git a/bbb-webhooks/userMapping.js b/bbb-webhooks/userMapping.js
index 3571396a52ec36df7dc86421219d4559ae01830b..056e78a7a5b2586b5c52a4f2ec9452bd769c26d8 100644
--- a/bbb-webhooks/userMapping.js
+++ b/bbb-webhooks/userMapping.js
@@ -33,7 +33,7 @@ module.exports = class UserMapping {
this.internalUserID = null;
this.meetingId = null;
this.user = null;
- this.redisClient = Application.redisClient;
+ this.redisClient = Application.redisClient();
}
save(callback) {
@@ -165,7 +165,7 @@ module.exports = class UserMapping {
// Gets all mappings from redis to populate the local database.
// Calls `callback()` when done.
static resync(callback) {
- let client = Application.redisClient;
+ let client = Application.redisClient();
let tasks = [];
return client.smembers(config.get("redis.keys.userMaps"), (error, mappings) => {
diff --git a/bbb-webhooks/web_hooks.js b/bbb-webhooks/web_hooks.js
index 9f2531ad1cd749d452d1e4895734aa5c05f7f241..5c8235b080ddc65b0232f244808d9858627796b9 100644
--- a/bbb-webhooks/web_hooks.js
+++ b/bbb-webhooks/web_hooks.js
@@ -14,7 +14,7 @@ const UserMapping = require("./userMapping.js");
module.exports = class WebHooks {
constructor() {
- this.subscriberEvents = Application.redisClient;
+ this.subscriberEvents = Application.redisPubSubClient();
}
start(callback) {
@@ -73,10 +73,10 @@ module.exports = class WebHooks {
}
});
- for (i = 0; i < config.get("hooks.channels"); ++i) {
- const channel = config.get("hooks.channels")[i];
+ config.get("hooks.channels").forEach((channel) => {
this.subscriberEvents.psubscribe(channel);
- }
+ });
+
}
// Send raw data to hooks that are not expecting mapped messages