Skip to content

Fix race condition in discussion file operations (#250) #260

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
boot-coco wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Fix race condition in discussion file operations (#250) #260

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
212 changes: 129 additions & 83 deletions server/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,6 +376,20 @@ function saveDiscussions(docId, data) {
fs.writeFileSync(filePath, JSON.stringify(data, null, 2));
}

// Per-document write lock to prevent concurrent read-modify-write data loss (#250)
const discussionLocks = new Map();

function withDiscussionLock(docId, fn) {
if (!discussionLocks.has(docId)) {
discussionLocks.set(docId, Promise.resolve());
}
const prev = discussionLocks.get(docId);
let resolve;
const next = new Promise(r => resolve = r);
discussionLocks.set(docId, next);
return prev.then(() => fn()).finally(() => resolve());
}

// --------------------------------------------------------- discussion endpoints

// Get discussions for a document (auth added per #239 C-2)
Expand All @@ -398,45 +412,53 @@ app.post('/discussions', v2Auth, (req, res) => {
return res.status(400).json({ error: 'Missing required fields' });
}

const data = loadDiscussions(doc);

if (discussionId) {
// Append to existing discussion
const discussion = data.discussions.find(d => d.id === discussionId);
if (!discussion) return res.status(404).json({ error: 'Discussion not found' });

discussion.messages.push({
role: 'user',
content: message,
userName,
timestamp: new Date().toISOString()
});
withDiscussionLock(doc, () => {
const data = loadDiscussions(doc);

saveDiscussions(doc, data);
if (discussionId) {
// Append to existing discussion
const discussion = data.discussions.find(d => d.id === discussionId);
if (!discussion) {
res.status(404).json({ error: 'Discussion not found' });
return;
}

sendWebhook('discussion.message', { doc, discussionId, userName, message });
res.json({ success: true, discussionId });
} else {
// New discussion
const newDiscussion = {
id: `disc-${Date.now()}-${Math.random().toString(36).substr(2, 9)}`,
quote: quote || '',
version: version || 'latest',
createdAt: new Date().toISOString(),
messages: [{
discussion.messages.push({
role: 'user',
content: message,
userName,
timestamp: new Date().toISOString()
}]
};
});

data.discussions.push(newDiscussion);
saveDiscussions(doc, data);
saveDiscussions(doc, data);

sendWebhook('discussion.created', { doc, discussionId: newDiscussion.id, userName, quote, message });
res.json({ success: true, discussionId: newDiscussion.id });
}
sendWebhook('discussion.message', { doc, discussionId, userName, message });
res.json({ success: true, discussionId });
} else {
// New discussion
const newDiscussion = {
id: `disc-${Date.now()}-${Math.random().toString(36).substr(2, 9)}`,
quote: quote || '',
version: version || 'latest',
createdAt: new Date().toISOString(),
messages: [{
role: 'user',
content: message,
userName,
timestamp: new Date().toISOString()
}]
};

data.discussions.push(newDiscussion);
saveDiscussions(doc, data);

sendWebhook('discussion.created', { doc, discussionId: newDiscussion.id, userName, quote, message });
res.json({ success: true, discussionId: newDiscussion.id });
}
}).catch(err => {
console.error('Discussion write error:', err);
if (!res.headersSent) res.status(500).json({ error: 'Internal server error' });
});
});

// Post a response to a discussion (called by an AI agent or admin)
Expand All @@ -446,48 +468,64 @@ app.post('/respond', v2Auth, (req, res) => {
return res.status(400).json({ error: 'Missing required fields' });
}

const data = loadDiscussions(doc);
const discussion = data.discussions.find(d => d.id === discussionId);
if (!discussion) return res.status(404).json({ error: 'Discussion not found' });

const pendingIdx = discussion.messages.findIndex(m => m.pending);
if (pendingIdx !== -1) {
discussion.messages[pendingIdx] = {
role: 'assistant',
content: response,
timestamp: new Date().toISOString()
};
} else {
discussion.messages.push({
role: 'assistant',
content: response,
timestamp: new Date().toISOString()
});
}
withDiscussionLock(doc, () => {
const data = loadDiscussions(doc);
const discussion = data.discussions.find(d => d.id === discussionId);
if (!discussion) {
res.status(404).json({ error: 'Discussion not found' });
return;
}

saveDiscussions(doc, data);
res.json({ success: true });
const pendingIdx = discussion.messages.findIndex(m => m.pending);
if (pendingIdx !== -1) {
discussion.messages[pendingIdx] = {
role: 'assistant',
content: response,
timestamp: new Date().toISOString()
};
} else {
discussion.messages.push({
role: 'assistant',
content: response,
timestamp: new Date().toISOString()
});
}

saveDiscussions(doc, data);
res.json({ success: true });
}).catch(err => {
console.error('Discussion write error:', err);
if (!res.headersSent) res.status(500).json({ error: 'Internal server error' });
});
});

// Resolve or reopen a discussion
app.post('/discussions/resolve', v2Auth, (req, res) => {
const { doc, discussionId, action } = req.body;
if (!doc || !discussionId) return res.status(400).json({ error: 'Missing doc or discussionId' });

const data = loadDiscussions(doc);
const disc = data.discussions.find(d => d.id === discussionId);
if (!disc) return res.status(404).json({ error: 'Discussion not found' });
withDiscussionLock(doc, () => {
const data = loadDiscussions(doc);
const disc = data.discussions.find(d => d.id === discussionId);
if (!disc) {
res.status(404).json({ error: 'Discussion not found' });
return;
}

if (action === 'reopen') {
disc.applied = false;
disc.appliedAt = null;
} else {
disc.applied = true;
disc.appliedAt = new Date().toISOString();
}
if (action === 'reopen') {
disc.applied = false;
disc.appliedAt = null;
} else {
disc.applied = true;
disc.appliedAt = new Date().toISOString();
}

saveDiscussions(doc, data);
res.json({ success: true });
saveDiscussions(doc, data);
res.json({ success: true });
}).catch(err => {
console.error('Discussion write error:', err);
if (!res.headersSent) res.status(500).json({ error: 'Internal server error' });
});
});

// Submit a reply via API (for AI agent or admin use)
Expand All @@ -497,27 +535,35 @@ app.post('/submit-reply', v2Auth, (req, res) => {
return res.status(400).json({ error: 'Missing doc, discussionId, or reply' });
}

const data = loadDiscussions(doc);
const discussion = data.discussions.find(d => d.id === discussionId);
if (!discussion) return res.status(404).json({ error: 'Discussion not found' });

const pendingIdx = discussion.messages.findIndex(m => m.pending);
if (pendingIdx !== -1) {
discussion.messages[pendingIdx] = {
role: 'assistant',
content: reply,
timestamp: new Date().toISOString()
};
} else {
discussion.messages.push({
role: 'assistant',
content: reply,
timestamp: new Date().toISOString()
});
}
withDiscussionLock(doc, () => {
const data = loadDiscussions(doc);
const discussion = data.discussions.find(d => d.id === discussionId);
if (!discussion) {
res.status(404).json({ error: 'Discussion not found' });
return;
}

saveDiscussions(doc, data);
res.json({ success: true });
const pendingIdx = discussion.messages.findIndex(m => m.pending);
if (pendingIdx !== -1) {
discussion.messages[pendingIdx] = {
role: 'assistant',
content: reply,
timestamp: new Date().toISOString()
};
} else {
discussion.messages.push({
role: 'assistant',
content: reply,
timestamp: new Date().toISOString()
});
}

saveDiscussions(doc, data);
res.json({ success: true });
}).catch(err => {
console.error('Discussion write error:', err);
if (!res.headersSent) res.status(500).json({ error: 'Internal server error' });
});
});

// List pending discussions (discussions that have an unanswered pending message)
Expand Down