Webionite
/
haste-server
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Ensure conflict resolution in keyspace

This commit is contained in:
John Crepezzi 2011-11-21 21:48:09 -05:00
parent 4ed87c4ec7
commit 0f2075fcda
2 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
TODO
View File

@ -1,4 +1,4 @@
cache headers for static assets cache headers for static assets (and on document GET)
tests tests
fix any annoying visual quirks fix any annoying visual quirks
add FAVICON add FAVICON
@ -6,7 +6,7 @@ cache static in memory
add feedback for errors to UI - esp. too long add feedback for errors to UI - esp. too long
copy URL to clipboard button copy URL to clipboard button
add about page add about page
add conflict resolution for keys when creating a post support built-in expiration
# shared version only # shared version only
some way to do announcements easily (and use for ads) some way to do announcements easily (and use for ads)

18
lib/document_handler.js
View File

@ -29,7 +29,6 @@ DocumentHandler.prototype.handleGet = function(key, response) {
// Handle adding a new Document // Handle adding a new Document
DocumentHandler.prototype.handlePost = function(request, response) { DocumentHandler.prototype.handlePost = function(request, response) {
var _this = this; var _this = this;
var key = this.randomKey();
var buffer = ''; var buffer = '';
request.on('data', function(data) { request.on('data', function(data) {
if (!buffer) { if (!buffer) {
@ -38,13 +37,14 @@ DocumentHandler.prototype.handlePost = function(request, response) {
buffer += data.toString(); buffer += data.toString();
if (_this.maxLength && buffer.length > _this.maxLength) { if (_this.maxLength && buffer.length > _this.maxLength) {
_this.cancelled = true; _this.cancelled = true;
winston.warn('attempted to upload a document >maxLength', { maxLength: _this.maxLength }); winston.warn('document >maxLength', { maxLength: _this.maxLength });
response.writeHead(400, { 'content-type': 'application/json' }); response.writeHead(400, { 'content-type': 'application/json' });
response.end(JSON.stringify({ message: 'document exceeds maximum length' })); response.end(JSON.stringify({ message: 'document exceeds maximum length' }));
} }
}); });
request.on('end', function(end) { request.on('end', function(end) {
if (_this.cancelled) return; if (_this.cancelled) return;
_this.chooseKey(function(key) {
_this.store.set(key, buffer, function(res) { _this.store.set(key, buffer, function(res) {
if (res) { if (res) {
winston.verbose('added document', { key: key }); winston.verbose('added document', { key: key });
@ -57,6 +57,7 @@ DocumentHandler.prototype.handlePost = function(request, response) {
} }
}); });
}); });
});
request.on('error', function(error) { request.on('error', function(error) {
winston.error('connection error: ' + error.message); winston.error('connection error: ' + error.message);
response.writeHead(500, { 'content-type': 'application/json' }); response.writeHead(500, { 'content-type': 'application/json' });
@ -64,6 +65,19 @@ DocumentHandler.prototype.handlePost = function(request, response) {
}); });
}; };
// Get a random key that hasn't been already used
DocumentHandler.prototype.chooseKey = function(callback) {
var key = this.randomKey();
var _this = this;
this.store.get(key, function(ret) {
if (ret) {
_this.chooseKey(callback);
} else {
callback(key);
}
});
};
// Generate a random key // Generate a random key
DocumentHandler.prototype.randomKey = function() { DocumentHandler.prototype.randomKey = function() {
var text = ''; var text = '';