Clean up some code and move document stores into subfolder

This commit is contained in:
John Crepezzi 2012-01-21 15:19:55 -05:00
parent 483fce891d
commit f37d1ad401
10 changed files with 92 additions and 44 deletions

View file

@ -1,6 +1,9 @@
# Haste # Haste
Haste is an open-source pastebin software written in node.js, which is easily installable in any network. It can be backed by either redis or filesystem, and has a very easy adapter interface for other stores. A publicly available version can be found at [hastebin.com](http://hastebin.com) Haste is an open-source pastebin software written in node.js, which is easily
installable in any network. It can be backed by either redis or filesystem,
and has a very easy adapter interface for other stores. A publicly available
version can be found at [hastebin.com](http://hastebin.com)
Major design objectives: Major design objectives:
@ -8,11 +11,13 @@ Major design objectives:
* Be really simple * Be really simple
* Be easy to set up and use * Be easy to set up and use
Haste works really well with a little utility called haste-client, allowing you to do things like: Haste works really well with a little utility called haste-client, allowing you
to do things like:
`cat something | haste` `cat something | haste`
which will output a URL to share containing the contents of `cat something`'s STDOUT which will output a URL to share containing the contents of `cat something`'s
STDOUT
## Tested Browsers ## Tested Browsers
@ -35,7 +40,8 @@ which will output a URL to share containing the contents of `cat something`'s ST
* `maxLength` - maximum length of a paste (default none) * `maxLength` - maximum length of a paste (default none)
* `staticMaxAge` - max age for static assets (86400) * `staticMaxAge` - max age for static assets (86400)
* `recompressStatisAssets` - whether or not to compile static js assets (true) * `recompressStatisAssets` - whether or not to compile static js assets (true)
* `documents` - static documents to serve (ex: http://hastebin.com/about.com) in addition to static assets. These will never expire. * `documents` - static documents to serve (ex: http://hastebin.com/about.com)
in addition to static assets. These will never expire.
* `storage` - storage options (see below) * `storage` - storage options (see below)
* `logging` - logging preferences * `logging` - logging preferences
* `keyGenerator` - key generator options (see below) * `keyGenerator` - key generator options (see below)
@ -63,13 +69,15 @@ Generates a random key
} }
``` ```
The _optional_ keySpace argument is a string of acceptable characters for the key. The _optional_ keySpace argument is a string of acceptable characters
for the key.
## Storage ## Storage
### File ### File
To use file storage (the default) change the storage section in `config.js` to something like: To use file storage (the default) change the storage section in `config.js` to
something like:
``` json ``` json
{ {
@ -97,7 +105,9 @@ Once you've done that, your config section should look like:
} }
``` ```
You can also set an `expire` option to the number of seconds to expire keys in. This is off by default, but will constantly kick back expirations on each view or post. You can also set an `expire` option to the number of seconds to expire keys in.
This is off by default, but will constantly kick back expirations on each view
or post.
All of which are optional except `type` with very logical default values. All of which are optional except `type` with very logical default values.
@ -117,7 +127,9 @@ Once you've done that, your config section should look like:
} }
``` ```
You can also set an `expire` option to the number of seconds to expire keys in. This behaves just like the redis expirations, but does not push expirations forward on GETs. You can also set an `expire` option to the number of seconds to expire keys in.
This behaves just like the redis expirations, but does not push expirations
forward on GETs.
All of which are optional except `type` with very logical default values. All of which are optional except `type` with very logical default values.
@ -132,11 +144,23 @@ John Crepezzi <john.crepezzi@gmail.com>
Copyright © 2011 John Crepezzi Copyright © 2011 John Crepezzi
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the Software), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the Software), to deal in
the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
of the Software, and to permit persons to whom the Software is furnished to do
so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE
### Other components: ### Other components:

View file

@ -1 +0,0 @@
* add feedback for errors to UI - esp. too long

View file

@ -1,33 +1,37 @@
# Haste # Haste
Sharing code is a good thing, and it should be _really_ easy to do it. Sharing code is a good thing, and it should be _really_ easy to do it.
A lot of times, I want to show you something I'm seeing - and that's where we use pastebins. A lot of times, I want to show you something I'm seeing - and that's where we
use pastebins.
Haste is the prettiest, easist to use pastebin ever made. Haste is the prettiest, easist to use pastebin ever made.
## Basic Usage ## Basic Usage
Type what you want me to see, click "Save", and then copy the URL. Send that URL Type what you want me to see, click "Save", and then copy the URL. Send that
to someone and they'll see what you see. URL to someone and they'll see what you see.
To make a new entry, click "New" (or type 'control + n') To make a new entry, click "New" (or type 'control + n')
## From the Console ## From the Console
Most of the time I want to show you some text, its coming from my current console session. Most of the time I want to show you some text, its coming from my current
We should make it really easy to take code from the console and send it to people. console session. We should make it really easy to take code from the console
and send it to people.
`cat something | haste` # http://hastebin.com/1238193 `cat something | haste` # http://hastebin.com/1238193
You can even take this a step further, and cut out the last step of copying the URL with: You can even take this a step further, and cut out the last step of copying the
URL with:
* osx: `cat something | haste | pbcopy` * osx: `cat something | haste | pbcopy`
* linux: `cat something | haste | xsel` * linux: `cat something | haste | xsel`
After running that, the STDOUT output of `cat something` will show up at a URL which has After running that, the STDOUT output of `cat something` will show up at a URL
been conveniently copied to your clipboard. which has been conveniently copied to your clipboard.
That's all there is to that, and you can install it with `gem install haste` right now. That's all there is to that, and you can install it with `gem install haste`
right now.
* osx: you will need to have an up to date version of Xcode * osx: you will need to have an up to date version of Xcode
* linux: you will need to have rubygems and ruby-devel installed * linux: you will need to have rubygems and ruby-devel installed
@ -37,9 +41,10 @@ Pastes will stay for 30 days from their last view.
## Privacy ## Privacy
While the contents of hastebin.com are not directly crawled by any search robot that While the contents of hastebin.com are not directly crawled by any search robot
obeys "robots.txt", there should be no great expectation of privacy. Post things at your that obeys "robots.txt", there should be no great expectation of privacy. Post
own risk. Not responsible for any loss of data or removed pastes. things at your own risk. Not responsible for any loss of data or removed
pastes.
## Open Source ## Open Source

View file

@ -54,13 +54,15 @@ DocumentHandler.prototype.handlePost = function(request, response) {
request.on('data', function(data) { request.on('data', function(data) {
if (!buffer) { if (!buffer) {
response.writeHead(200, { 'content-type': 'application/json' }); response.writeHead(200, { 'content-type': 'application/json' });
} }
buffer += data.toString(); buffer += data.toString();
if (_this.maxLength && buffer.length > _this.maxLength) { if (_this.maxLength && buffer.length > _this.maxLength) {
cancelled = true; cancelled = true;
winston.warn('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) {
@ -96,7 +98,7 @@ DocumentHandler.prototype.chooseKey = function(callback) {
} else { } else {
callback(key); callback(key);
} }
}); });
}; };
DocumentHandler.prototype.acceptableKey = function() { DocumentHandler.prototype.acceptableKey = function() {

View file

@ -19,19 +19,21 @@ FileDocumentStore.md5 = function(str) {
return md5sum.digest('hex'); return md5sum.digest('hex');
}; };
// Save data in a file, key as md5 - since we don't know what we could be passed here // Save data in a file, key as md5 - since we don't know what we could
// be passed here
FileDocumentStore.prototype.set = function(key, data, callback, skipExpire) { FileDocumentStore.prototype.set = function(key, data, callback, skipExpire) {
try { try {
var _this = this; var _this = this;
fs.mkdir(this.basePath, '700', function() { fs.mkdir(this.basePath, '700', function() {
fs.writeFile(_this.basePath + '/' + _this.md5(key), data, 'utf8', function(err) { var fn = _this.basePath + '/' + _this.md5(key);
fs.writeFile(fn, data, 'utf8', function(err) {
if (err) { if (err) {
callback(false); callback(false);
} }
else { else {
callback(true); callback(true);
if (_this.expire && !skipExpire) { if (_this.expire && !skipExpire) {
winston.warn('file store cannot set expirations on keys'); winston.warn('file store cannot set expirations on keys');
} }
} }
}); });
@ -44,14 +46,15 @@ FileDocumentStore.prototype.set = function(key, data, callback, skipExpire) {
// Get data from a file from key // Get data from a file from key
FileDocumentStore.prototype.get = function(key, callback, skipExpire) { FileDocumentStore.prototype.get = function(key, callback, skipExpire) {
var _this = this; var _this = this;
fs.readFile(this.basePath + '/' + _this..md5(key), 'utf8', function(err, data) { var fn = this.basePath + '/' + this.md5(key);
fs.readFile(fn, 'utf8', function(err, data) {
if (err) { if (err) {
callback(false); callback(false);
} }
else { else {
callback(data); callback(data);
if (_this.expire && !skipExpire) { if (_this.expire && !skipExpire) {
winston.warn('file store cannot set expirations on keys'); winston.warn('file store cannot set expirations on keys');
} }
} }
}); });

View file

@ -24,7 +24,8 @@ MemcachedDocumentStore.connect = function(options) {
}; };
// Save file in a key // Save file in a key
MemcachedDocumentStore.prototype.set = function(key, data, callback, skipExpire) { MemcachedDocumentStore.prototype.set =
function(key, data, callback, skipExpire) {
MemcachedDocumentStore.client.set(key, data, function(err, reply) { MemcachedDocumentStore.client.set(key, data, function(err, reply) {
err ? callback(false) : callback(true); err ? callback(false) : callback(true);
}, skipExpire ? 0 : this.expire); }, skipExpire ? 0 : this.expire);
@ -36,7 +37,7 @@ MemcachedDocumentStore.prototype.get = function(key, callback, skipExpire) {
MemcachedDocumentStore.client.get(key, function(err, reply) { MemcachedDocumentStore.client.get(key, function(err, reply) {
callback(err ? false : reply); callback(err ? false : reply);
if (_this.expire && !skipExpire) { if (_this.expire && !skipExpire) {
winston.warn('memcache store does not currently push forward expirations on GET'); winston.warn('store does not currently push forward expirations on GET');
} }
}); });
}; };

View file

@ -23,7 +23,10 @@ RedisDocumentStore.connect = function(options) {
RedisDocumentStore.client = redis.createClient(port, host); RedisDocumentStore.client = redis.createClient(port, host);
RedisDocumentStore.client.select(index, function(err, reply) { RedisDocumentStore.client.select(index, function(err, reply) {
if (err) { if (err) {
winston.error('error connecting to redis index ' + index, { error: err.message }); winston.error(
'error connecting to redis index ' + index,
{ error: err.message }
);
process.exit(1); process.exit(1);
} }
else { else {
@ -67,7 +70,7 @@ RedisDocumentStore.prototype.get = function(key, callback, skipExpire) {
_this.setExpiration(key); _this.setExpiration(key);
} }
callback(err ? false : reply); callback(err ? false : reply);
}); });
}; };
module.exports = RedisDocumentStore; module.exports = RedisDocumentStore;

View file

@ -8,8 +8,10 @@ var RandomKeyGenerator = function(options) {
// Generate a random key // Generate a random key
RandomKeyGenerator.prototype.createKey = function(keyLength) { RandomKeyGenerator.prototype.createKey = function(keyLength) {
var text = ''; var text = '';
var index;
for (var i = 0; i < keyLength; i++) { for (var i = 0; i < keyLength; i++) {
text += this.keyspace.charAt(Math.floor(Math.random() * this.keyspace.length)); index = Math.floor(Math.random() * this.keyspace.length);
text += this.keyspace.charAt(index);
} }
return text; return text;
}; };

View file

@ -34,7 +34,7 @@ if (!config.storage) {
if (!config.storage.type) { if (!config.storage.type) {
config.storage.type = 'file'; config.storage.type = 'file';
} }
var Store = require('./lib/' + config.storage.type + '_document_store'); var Store = require('./lib/document_stores/' + config.storage.type);
var preferredStore = new Store(config.storage); var preferredStore = new Store(config.storage);
// Compress the static javascript assets // Compress the static javascript assets
@ -45,8 +45,10 @@ if (config.recompressStaticAssets) {
for (var i = 0; i < list.length; i++) { for (var i = 0; i < list.length; i++) {
var item = list[i]; var item = list[i];
var orig_code, ast; var orig_code, ast;
if ((item.indexOf('.js') === item.length - 3) && (item.indexOf('.min.js') === -1)) { if ((item.indexOf('.js') === item.length - 3) &&
dest = item.substring(0, item.length - 3) + '.min' + item.substring(item.length - 3); (item.indexOf('.min.js') === -1)) {
dest = item.substring(0, item.length - 3) + '.min' +
item.substring(item.length - 3);
orig_code = fs.readFileSync('./static/' + item, 'utf8'); orig_code = fs.readFileSync('./static/' + item, 'utf8');
ast = jsp.parse(orig_code); ast = jsp.parse(orig_code);
ast = pro.ast_mangle(ast); ast = pro.ast_mangle(ast);
@ -67,7 +69,10 @@ for (var name in config.documents) {
}, true); }, true);
} }
else { else {
winston.warn('failed to load static document', { name: name, path: path }); winston.warn(
'failed to load static document',
{ name: name, path: path }
);
} }
}); });
} }
@ -96,14 +101,18 @@ connect.createServer(
var key = request.params.id.split('.')[0]; var key = request.params.id.split('.')[0];
return documentHandler.handleRawGet(key, response, skipExpire); return documentHandler.handleRawGet(key, response, skipExpire);
}); });
// add documents // add documents
app.post('/documents', function(request, response, next) { app.post('/documents', function(request, response, next) {
return documentHandler.handlePost(request, response); return documentHandler.handlePost(request, response);
}); });
// get documents // get documents
app.get('/documents/:id', function(request, response, next) { app.get('/documents/:id', function(request, response, next) {
var skipExpire = !!config.documents[request.params.id]; var skipExpire = !!config.documents[request.params.id];
return documentHandler.handleGet(request.params.id, response, skipExpire); return documentHandler.handleGet(
request.params.id,
response,
skipExpire
);
}); });
}), }),
// Otherwise, static // Otherwise, static

View file

@ -1,4 +1,4 @@
var RedisDocumentStore = require('../lib/redis_document_store'); var RedisDocumentStore = require('../lib/document_stores/redis');
var winston = require('winston'); var winston = require('winston');
winston.remove(winston.transports.Console); winston.remove(winston.transports.Console);