public-offering
/
pad.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PadMessageHandler.js: migrate to thenify

pull/3559/head
Ray Bellis 2019-01-22 15:48:29 +00:00
parent 5d7162ac9a
commit 584e481430
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/node/handler/PadMessageHandler.js
View File

@ -61,7 +61,7 @@ stats.gauge('totalUsers', function() {
/** /**
* A changeset queue per pad that is processed by handleUserChanges() * A changeset queue per pad that is processed by handleUserChanges()
*/ */
var padChannels = new channels.channels(handleUserChanges); var padChannels = new channels.channels(thenify(handleUserChanges));
/** /**
* Saves the Socket class we need to send and receive data from the client * Saves the Socket class we need to send and receive data from the client
@ -330,7 +330,7 @@ function handleSaveRevisionMessage(client, message){
* @param msg {Object} the message we're sending * @param msg {Object} the message we're sending
* @param sessionID {string} the socketIO session to which we're sending this message * @param sessionID {string} the socketIO session to which we're sending this message
*/ */
exports.handleCustomObjectMessage = function(msg, sessionID, cb) { exports.handleCustomObjectMessage = thenify(function(msg, sessionID, cb) {
if (msg.data.type === "CUSTOM") { if (msg.data.type === "CUSTOM") {
if (sessionID){ if (sessionID){
// a sessionID is targeted: directly to this sessionID // a sessionID is targeted: directly to this sessionID
@ -341,7 +341,8 @@ exports.handleCustomObjectMessage = function(msg, sessionID, cb) {
} }
} }
cb(null, {}); cb(null, {});
} });
/** /**
* Handles a custom message (sent via HTTP API request) * Handles a custom message (sent via HTTP API request)
@ -349,7 +350,7 @@ exports.handleCustomObjectMessage = function(msg, sessionID, cb) {
* @param padID {Pad} the pad to which we're sending this message * @param padID {Pad} the pad to which we're sending this message
* @param msgString {String} the message we're sending * @param msgString {String} the message we're sending
*/ */
exports.handleCustomMessage = function(padID, msgString, cb) { exports.handleCustomMessage = thenify(function(padID, msgString, cb) {
var time = Date.now(); var time = Date.now();
var msg = { var msg = {
type: 'COLLABROOM', type: 'COLLABROOM',
@ -361,7 +362,7 @@ exports.handleCustomMessage = function(padID, msgString, cb) {
socketio.sockets.in(padID).json.send(msg); socketio.sockets.in(padID).json.send(msg);
cb(null, {}); cb(null, {});
} });
/** /**
* Handles a Chat Message * Handles a Chat Message