summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSam X. Chen <sam.xi.chen@gmail.com>2019-09-16 14:43:32 -0400
committerSam X. Chen <sam.xi.chen@gmail.com>2019-09-16 14:43:32 -0400
commit616903114f266253bce7a2a2e9e56ef295255965 (patch)
treef2ae1c51b602aa696cafbd2efe3e973767f43297
parent0b52ba4ded6b4a92e2b9b9f8bc0c5c8248126579 (diff)
downloadwekan-616903114f266253bce7a2a2e9e56ef295255965.tar.gz
wekan-616903114f266253bce7a2a2e9e56ef295255965.tar.bz2
wekan-616903114f266253bce7a2a2e9e56ef295255965.zip
Fix two-way webhooks - locking might fail sometime
-rw-r--r--server/notifications/outgoing.js128
-rw-r--r--server/publications/boards.js2
2 files changed, 82 insertions, 48 deletions
diff --git a/server/notifications/outgoing.js b/server/notifications/outgoing.js
index 6a60e544..5bc2c540 100644
--- a/server/notifications/outgoing.js
+++ b/server/notifications/outgoing.js
@@ -10,11 +10,39 @@ const postCatchError = Meteor.wrapAsync((url, options, resolve) => {
const Lock = {
_lock: {},
- has(id) {
- return !!this._lock[id];
+ _timer: {},
+ echoDelay: 500, // echo should be happening much faster
+ normalDelay: 1e3, // normally user typed comment will be much slower
+ ECHO: 2,
+ NORMAL: 1,
+ NULL: 0,
+ has(id, value) {
+ const existing = this._lock[id];
+ let ret = this.NULL;
+ if (existing) {
+ ret = existing === value ? this.ECHO : this.NORMAL;
+ }
+ return ret;
+ },
+ clear(id, delay) {
+ const previous = this._timer[id];
+ if (previous) {
+ Meteor.clearTimeout(previous);
+ }
+ this._timer[id] = Meteor.setTimeout(() => this.unset(id), delay);
},
- set(id) {
- this._lock[id] = 1;
+ set(id, value) {
+ const state = this.has(id, value);
+ let delay = this.normalDelay;
+ if (state === this.ECHO) {
+ delay = this.echoDelay;
+ }
+ if (!value) {
+ // user commented, we set a lock
+ value = 1;
+ }
+ this._lock[id] = value;
+ this.clear(id, delay); // always auto reset the locker after delay
},
unset(id) {
delete this._lock[id];
@@ -33,40 +61,44 @@ const webhooksAtbts = (process.env.WEBHOOKS_ATTRIBUTES &&
'commentId',
'swimlaneId',
];
-const responseFunc = 'reactOnHookResponse';
-Meteor.methods({
- [responseFunc](data) {
- check(data, Object);
- const paramCommentId = data.commentId;
- const paramCardId = data.cardId;
- const paramBoardId = data.boardId;
- const newComment = data.comment;
- if (paramCardId && paramBoardId && newComment) {
- // only process data with the cardid, boardid and comment text, TODO can expand other functions here to react on returned data
- const comment = CardComments.findOne({
- _id: paramCommentId,
- cardId: paramCardId,
- boardId: paramBoardId,
- });
+const responseFunc = data => {
+ const paramCommentId = data.commentId;
+ const paramCardId = data.cardId;
+ const paramBoardId = data.boardId;
+ const newComment = data.comment;
+ if (paramCardId && paramBoardId && newComment) {
+ // only process data with the cardid, boardid and comment text, TODO can expand other functions here to react on returned data
+ const comment = CardComments.findOne({
+ _id: paramCommentId,
+ cardId: paramCardId,
+ boardId: paramBoardId,
+ });
+ const board = Boards.findOne(paramBoardId);
+ const card = Cards.findOne(paramCardId);
+ if (board && card) {
if (comment) {
- CardComments.update(comment._id, {
+ Lock.set(comment._id, newComment);
+ CardComments.direct.update(comment._id, {
$set: {
text: newComment,
},
});
- } else {
- const userId = data.userId;
- if (userId) {
- CardComments.insert({
- text: newComment,
- userId,
- cardId,
- boardId,
- });
- }
+ }
+ } else {
+ const userId = data.userId;
+ if (userId) {
+ const inserted = CardComments.direct.insert({
+ text: newComment,
+ userId,
+ cardId,
+ boardId,
+ });
+ Lock.set(inserted._id, newComment);
}
}
- },
+ }
+};
+Meteor.methods({
outgoingWebhooks(integration, description, params) {
check(integration, Object);
check(description, String);
@@ -119,9 +151,20 @@ Meteor.methods({
if (token) headers['X-Wekan-Token'] = token;
const options = {
headers,
- data: is2way ? clonedParams : value,
+ data: is2way ? { description, ...clonedParams } : value,
};
const url = integration.url;
+ if (is2way) {
+ const cid = params.commentId;
+ const comment = params.comment;
+ const lockState = cid && Lock.has(cid, comment);
+ if (cid && lockState !== Lock.NULL) {
+ // it's a comment and there is a previous lock
+ return;
+ } else if (cid) {
+ Lock.set(cid, comment); // set a lock here
+ }
+ }
const response = postCatchError(url, options);
if (
@@ -131,21 +174,12 @@ Meteor.methods({
response.statusCode < 300
) {
if (is2way) {
- const cid = params.commentId;
- const tooSoon = Lock.has(cid); // if an activity happens to fast, notification shouldn't fire with the same id
- if (!tooSoon) {
- let clearNotification = () => {};
- if (cid) {
- Lock.set(cid);
- const clearNotificationFlagTimeout = 1000;
- clearNotification = () => Lock.unset(cid);
- Meteor.setTimeout(clearNotification, clearNotificationFlagTimeout);
- }
- const data = response.data; // only an JSON encoded response will be actioned
- if (data) {
- Meteor.call(responseFunc, data, () => {
- clearNotification();
- });
+ const data = response.data; // only an JSON encoded response will be actioned
+ if (data) {
+ try {
+ responseFunc(data);
+ } catch (e) {
+ throw new Meteor.Error('error-process-data');
}
}
}
diff --git a/server/publications/boards.js b/server/publications/boards.js
index 6864e7b7..bb8ac786 100644
--- a/server/publications/boards.js
+++ b/server/publications/boards.js
@@ -148,7 +148,7 @@ Meteor.publishRelations('board', function(boardId, isArchived) {
function(cardId, card) {
if (card.type === 'cardType-linkedCard') {
const impCardId = card.linkedId;
- subCards.push(impCardId); // GitHub issue #2688 and #2693
+ subCards.push(impCardId); // GitHub issue #2688 and #2693
cardComments.push(impCardId);
attachments.push(impCardId);
checklists.push(impCardId);