Fix header name

.dockerignore

@@ -1,8 +0,0 @@
-Dockerfile
-.git
-npm-debug.log
-node_modules
-*.swp
-*.swo
-data
-*.DS_Store

.eslintignore

@@ -1,2 +0,0 @@
-**/*.min.js
-config.js

.eslintrc.json

@@ -1,25 +0,0 @@
-{
-    "env": {
-        "es6": true,
-        "node": true
-    },
-    "extends": "eslint:recommended",
-    "rules": {
-        "indent": [
-            "error",
-            2
-        ],
-        "linebreak-style": [
-            "error",
-            "unix"
-        ],
-        "quotes": [
-            "error",
-            "single"
-        ],
-        "semi": [
-            "error",
-            "always"
-        ]
-    }
-}

.gitignore

@@ -4,4 +4,3 @@ node_modules
 *.swo
 data
 *.DS_Store
-config.json

Dockerfile

@@ -1,68 +0,0 @@
-FROM node:14.8.0-stretch
-
-RUN mkdir -p /usr/src/app && \
-    chown node:node /usr/src/app
-
-USER node:node
-
-WORKDIR /usr/src/app
-
-COPY --chown=node:node . .
-
-RUN npm install && \
-    npm install redis@0.8.1 && \
-    npm install pg@4.1.1 && \
-    npm install memcached@2.2.2 && \
-    npm install aws-sdk@2.738.0 && \
-    npm install rethinkdbdash@2.3.31
-
-ENV STORAGE_TYPE=memcached \
-    STORAGE_HOST=127.0.0.1 \
-    STORAGE_PORT=11211\
-    STORAGE_EXPIRE_SECONDS=2592000\
-    STORAGE_DB=2 \
-    STORAGE_AWS_BUCKET= \
-    STORAGE_AWS_REGION= \
-    STORAGE_USENAME= \
-    STORAGE_PASSWORD= \
-    STORAGE_FILEPATH=
-
-ENV LOGGING_LEVEL=verbose \
-    LOGGING_TYPE=Console \
-    LOGGING_COLORIZE=true
-
-ENV HOST=0.0.0.0\
-    PORT=7777\
-    KEY_LENGTH=10\
-    MAX_LENGTH=400000\
-    STATIC_MAX_AGE=86400\
-    RECOMPRESS_STATIC_ASSETS=true
-
-ENV KEYGENERATOR_TYPE=phonetic \
-    KEYGENERATOR_KEYSPACE=
-
-ENV RATELIMITS_NORMAL_TOTAL_REQUESTS=500\
-    RATELIMITS_NORMAL_EVERY_MILLISECONDS=60000 \
-    RATELIMITS_WHITELIST_TOTAL_REQUESTS= \
-    RATELIMITS_WHITELIST_EVERY_MILLISECONDS=  \
-    # comma separated list for the whitelisted \
-    RATELIMITS_WHITELIST=example1.whitelist,example2.whitelist \
-    \
-    RATELIMITS_BLACKLIST_TOTAL_REQUESTS= \
-    RATELIMITS_BLACKLIST_EVERY_MILLISECONDS= \
-    # comma separated list for the blacklisted \
-    RATELIMITS_BLACKLIST=example1.blacklist,example2.blacklist
-ENV DOCUMENTS=about=./about.md
-
-EXPOSE ${PORT}
-STOPSIGNAL SIGINT
-ENTRYPOINT [ "bash", "docker-entrypoint.sh" ]
-
-HEALTHCHECK --interval=30s --timeout=30s --start-period=5s \
-    --retries=3 CMD [ "sh", "-c", "echo -n 'curl localhost:7777... '; \
-    (\
-        curl -sf localhost:7777 > /dev/null\
-    ) && echo OK || (\
-        echo Fail && exit 2\
-    )"]
-CMD ["npm", "start"]

README.md

@@ -31,16 +31,16 @@ STDOUT.  Check the README there for more details and usages.
 1.  Download the package, and expand it
 2.  Explore the settings inside of config.js, but the defaults should be good
 3.  `npm install`
-4.  `npm start` (you may specify an optional `<config-path>` as well)
+4.  `npm start`
 
 ## Settings
 
 * `host` - the host the server runs on (default localhost)
 * `port` - the port the server runs on (default 7777)
 * `keyLength` - the length of the keys to user (default 10)
-* `maxLength` - maximum length of a paste (default 400000)
+* `maxLength` - maximum length of a paste (default none)
 * `staticMaxAge` - max age for static assets (86400)
-* `recompressStaticAssets` - 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.
 * `storage` - storage options (see below)
@@ -52,7 +52,7 @@ STDOUT.  Check the README there for more details and usages.
 
 When present, the `rateLimits` option enables built-in rate limiting courtesy
 of `connect-ratelimit`.  Any of the options supported by that library can be
-used and set in `config.js`.
+used and set in `config.json`.
 
 See the README for [connect-ratelimit](https://github.com/dharmafly/connect-ratelimit)
 for more information!
@@ -97,9 +97,7 @@ something like:
 }
 ```
 
-where `path` represents where you want the files stored.
+Where `path` represents where you want the files stored
-
-File storage currently does not support paste expiration, you can follow [#191](https://github.com/seejohnrun/haste-server/issues/191) for status updates.
 
 ### Redis
 
@@ -154,33 +152,11 @@ or post.
 
 All of which are optional except `type` with very logical default values.
 
-### MongoDB
-
-To use mongodb storage you must install the 'mongodb' package in npm
-
-`npm install mongodb`
-
-Once you've done that, your config section should look like:
-
-``` json
-{
-  "type": "mongo",
-  "connectionUrl": "mongodb://localhost:27017/database"
-}
-```
-
-You can also just set the environment variable for `DATABASE_URL` to your database connection url.
-
-Unlike with postgres you do NOT have to create the table in your mongo database prior to running.
-
-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.
-
 ### Memcached
 
-To use memcache storage you must install the `memcached` package via npm
+To use memcached storage you must install the `memcache` package via npm
 
-`npm install memcached`
+`npm install memcache`
 
 Once you've done that, your config section should look like:
 
@@ -198,162 +174,6 @@ forward on GETs.
 
 All of which are optional except `type` with very logical default values.
 
-### RethinkDB
-
-To use the RethinkDB storage system, you must install the `rethinkdbdash` package via npm
-
-`npm install rethinkdbdash`
-
-Once you've done that, your config section should look like this:
-
-``` json
-{
-  "type": "rethinkdb",
-  "host": "127.0.0.1",
-  "port": 28015,
-  "db": "haste"
-}
-```
-
-In order for this to work, the database must be pre-created before the script is ran.
-Also, you must create an `uploads` table, which will store all the data for uploads.
-
-You can optionally add the `user` and `password` properties to use a user system.
-
-### Google Datastore
-
-To use the Google Datastore storage system, you must install the `@google-cloud/datastore` package via npm
-
-`npm install @google-cloud/datastore`
-
-Once you've done that, your config section should look like this:
-
-``` json
-{
-  "type": "google-datastore"
-}
-```
-
-Authentication is handled automatically by [Google Cloud service account credentials](https://cloud.google.com/docs/authentication/getting-started), by providing authentication details to the GOOGLE_APPLICATION_CREDENTIALS environmental variable.
-
-### Amazon S3
-
-To use [Amazon S3](https://aws.amazon.com/s3/) as a storage system, you must
-install the `aws-sdk` package via npm:
-
-`npm install aws-sdk`
-
-Once you've done that, your config section should look like this:
-
-```json
-{
-  "type": "amazon-s3",
-  "bucket": "your-bucket-name",
-  "region": "us-east-1"
-}
-```
-
-Authentication is handled automatically by the client. Check
-[Amazon's documentation](https://docs.aws.amazon.com/sdk-for-javascript/v2/developer-guide/setting-credentials-node.html)
-for more information. You will need to grant your role these permissions to
-your bucket:
-
-```json
-{
-    "Version": "2012-10-17",
-    "Statement": [
-        {
-            "Action": [
-                "s3:GetObject",
-                "s3:PutObject"
-            ],
-            "Effect": "Allow",
-            "Resource": "arn:aws:s3:::your-bucket-name-goes-here/*"
-        }
-    ]
-}
-```
-
-## Docker
-
-### Build image
-
-```bash
-docker build --tag haste-server .
-```
-
-### Run container
-
-For this example we will run haste-server, and connect it to a redis server
-
-```bash
-docker run --name haste-server-container --env STORAGE_TYPE=redis --env STORAGE_HOST=redis-server --env STORAGE_PORT=6379 haste-server
-```
-
-### Use docker-compose example
-
-There is an example `docker-compose.yml` which runs haste-server together with memcached
-
-```bash
-docker-compose up
-```
-
-### Configuration
-
-The docker image is configured using environmental variables as you can see in the example above.
-
-Here is a list of all the environment variables
-
-### Storage
-
-|          Name          | Default value |                                                  Description                                                  |
-| :--------------------: | :-----------: | :-----------------------------------------------------------------------------------------------------------: |
-|      STORAGE_TYPE      |   memcached   |    Type of storage . Accepted values: "memcached","redis","postgres","rethinkdb", "amazon-s3", and "file"     |
-|      STORAGE_HOST      |   127.0.0.1   |                 Storage host. Applicable for types: memcached, redis, postgres, and rethinkdb                 |
-|      STORAGE_PORT      |     11211     |           Port on the storage host. Applicable for types: memcached, redis, postgres, and rethinkdb           |
-| STORAGE_EXPIRE_SECONDS |    2592000    | Number of seconds to expire keys in. Applicable for types. Redis, postgres, memcached. `expire` option to the |
-|       STORAGE_DB       |       2       |                    The name of the database. Applicable for redis, postgres, and rethinkdb                    |
-|    STORAGE_PASSWORD    |               |                       Password for database. Applicable for redis, postges, rethinkdb .                       |
-|    STORAGE_USERNAME    |               |                           Database username. Applicable for postgres, and rethinkdb                           |
-|   STORAGE_AWS_BUCKET   |               |                          Applicable for amazon-s3. This is the name of the S3 bucket                          |
-|   STORAGE_AWS_REGION   |               |                      Applicable for amazon-s3. The region in which the bucket is located                      |
-|    STORAGE_FILEPATH    |               |                            Path to file to save data to. Applicable for type file                             |
-
-### Logging
-
-|       Name        | Default value | Description |
-| :---------------: | :-----------: | :---------: |
-|   LOGGING_LEVEL   |    verbose    |             |
-|   LOGGING_TYPE=   |    Console    |
-| LOGGING_COLORIZE= |     true      |
-
-### Basics
-
-|           Name           |  Default value   |                                        Description                                        |
-| :----------------------: | :--------------: | :---------------------------------------------------------------------------------------: |
-|           HOST           |     0.0.0.0      |                         The hostname which the server answers on                          |
-|           PORT           |       7777       |                          The port on which the server is running                          |
-|        KEY_LENGTH        |        10        |                              the length of the keys to user                               |
-|        MAX_LENGTH        |      400000      |                                 maximum length of a paste                                 |
-|      STATIC_MAX_AGE      |      86400       |                                 max age for static assets                                 |
-| RECOMPRESS_STATIC_ASSETS |       true       |                        whether or not to compile static js assets                         |
-|    KEYGENERATOR_TYPE     |     phonetic     |             Type of key generator. Acceptable values: "phonetic", or "random"             |
-|  KEYGENERATOR_KEYSPACE   |                  |                  keySpace argument is a string of acceptable characters                   |
-|        DOCUMENTS         | about=./about.md | Comma separated list of static documents to serve. ex: \n about=./about.md,home=./home.md |
-
-### Rate limits
-
-|                 Name                 |             Default value             |                                       Description                                        |
-| :----------------------------------: | :-----------------------------------: | :--------------------------------------------------------------------------------------: |
-|   RATELIMITS_NORMAL_TOTAL_REQUESTS   |                  500                  | By default anyone uncategorized will be subject to 500 requests in the defined timespan. |
-| RATELIMITS_NORMAL_EVERY_MILLISECONDS |                 60000                 |             The timespan to allow the total requests for uncategorized users             |
-| RATELIMITS_WHITELIST_TOTAL_REQUESTS  |                                       |      By default client names in the whitelist will not have their requests limited.      |
-|  RATELIMITS_WHITELIST_EVERY_SECONDS  |                                       |      By default client names in the whitelist will not have their requests limited.      |
-|         RATELIMITS_WHITELIST         | example1.whitelist,example2.whitelist |           Comma separated list of the clients which are in the whitelist pool            |
-| RATELIMITS_BLACKLIST_TOTAL_REQUESTS  |                                       |    By default client names in the blacklist will be subject to 0 requests per hours.     |
-|  RATELIMITS_BLACKLIST_EVERY_SECONDS  |                                       |     By default client names in the blacklist will be subject to 0 requests per hours     |
-|         RATELIMITS_BLACKLIST         | example1.blacklist,example2.blacklist |           Comma separated list of the clients which are in the blacklistpool.            |
-
 ## Author
 
 John Crepezzi <john.crepezzi@gmail.com>

about.md

@@ -15,19 +15,45 @@ To make a new entry, click "New" (or type 'control + n')
 
 ## From the Console
 
-[bin-client](git.webionite.com/ceda_ei/bin-client)
+Most of the time I want to show you some text, it's coming from my current
+console session.  We should make it really easy to take code from the console
+and send it to people.
 
-Add the following to your bashrc/zshrc
+`cat something | haste` # http://hastebin.com/1238193
-```
+
-export MKR_BIN='https://bin.webionite.com/'
+You can even take this a step further, and cut out the last step of copying the
-export HASTEBIN=1
+URL with:
-```
+
+* osx: `cat something | haste | pbcopy`
+* linux: `cat something | haste | xsel`
+* windows: check out [WinHaste](https://github.com/ajryan/WinHaste)
+
+After running that, the STDOUT output of `cat something` will show up at a URL
+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.
+  * osx: you will need to have an up to date version of Xcode
+  * linux: you will need to have rubygems and ruby-devel installed
+
+## Duration
+
+Pastes will stay for 30 days from their last view.  They may be removed earlier
+and without notice.
+
+## Privacy
+
+While the contents of hastebin.com are not directly crawled by any search robot
+that obeys "robots.txt", there should be no great expectation of privacy.  Post
+things at your own risk. Not responsible for any loss of data or removed
+pastes.
 
 ## Open Source
 
 Haste can easily be installed behind your network, and it's all open source!
 
-* [haste-server](https://git.webionite.com/Webionite/haste-server)
+* [haste-client](https://github.com/seejohnrun/haste-client)
+* [haste-server](https://github.com/seejohnrun/haste-server)
 
 ## Author
 

config.js

@@ -33,7 +33,8 @@
   },
 
   "storage": {
-    "type": "file"
+    "type": "postgres",
+    "expire": 2592000
   },
 
   "documents": {

docker-compose.yaml

@@ -1,19 +0,0 @@
-version: '3.0'
-services:
-  haste-server:
-    build: .
-    networks:
-      - db-network
-    environment:
-      - STORAGE_TYPE=memcached
-      - STORAGE_HOST=memcached
-      - STORAGE_PORT=11211
-    ports:
-      - 7777:7777
-  memcached:
-    image: memcached:latest
-    networks:
-      - db-network
-
-networks:
-  db-network:

docker-entrypoint.js

@@ -1,108 +0,0 @@
-const {
-  HOST,
-  PORT,
-  KEY_LENGTH,
-  MAX_LENGTH,
-  STATIC_MAX_AGE,
-  RECOMPRESS_STATIC_ASSETS,
-  STORAGE_TYPE,
-  STORAGE_HOST,
-  STORAGE_PORT,
-  STORAGE_EXPIRE_SECONDS,
-  STORAGE_DB,
-  STORAGE_AWS_BUCKET,
-  STORAGE_AWS_REGION,
-  STORAGE_PASSWORD,
-  STORAGE_USERNAME,
-  STORAGE_FILEPATH,
-  LOGGING_LEVEL,
-  LOGGING_TYPE,
-  LOGGING_COLORIZE,
-  KEYGENERATOR_TYPE,
-  KEY_GENERATOR_KEYSPACE,
-  RATE_LIMITS_NORMAL_TOTAL_REQUESTS,
-  RATE_LIMITS_NORMAL_EVERY_MILLISECONDS,
-  RATE_LIMITS_WHITELIST_TOTAL_REQUESTS,
-  RATE_LIMITS_WHITELIST_EVERY_MILLISECONDS,
-  RATE_LIMITS_WHITELIST,
-  RATE_LIMITS_BLACKLIST_TOTAL_REQUESTS,
-  RATE_LIMITS_BLACKLIST_EVERY_MILLISECONDS,
-  RATE_LIMITS_BLACKLIST,
-  DOCUMENTS,
-} = process.env;
-
-const config = {
-  host: HOST,
-  port: PORT,
-
-  keyLength: KEY_LENGTH,
-
-  maxLength: MAX_LENGTH,
-
-  staticMaxAge: STATIC_MAX_AGE,
-
-  recompressStaticAssets: RECOMPRESS_STATIC_ASSETS,
-
-  logging: [
-    {
-      level: LOGGING_LEVEL,
-      type: LOGGING_TYPE,
-      colorize: LOGGING_COLORIZE,
-    },
-  ],
-
-  keyGenerator: {
-    type: KEYGENERATOR_TYPE,
-    keyspace: KEY_GENERATOR_KEYSPACE,
-  },
-
-  rateLimits: {
-    whitelist: RATE_LIMITS_WHITELIST ? RATE_LIMITS_WHITELIST.split(",") : [],
-    blacklist: RATE_LIMITS_BLACKLIST ? RATE_LIMITS_BLACKLIST.split(",") : [],
-    categories: {
-      normal: {
-        totalRequests: RATE_LIMITS_NORMAL_TOTAL_REQUESTS,
-        every: RATE_LIMITS_NORMAL_EVERY_MILLISECONDS,
-      },
-      whitelist:
-        RATE_LIMITS_WHITELIST_EVERY_MILLISECONDS ||
-        RATE_LIMITS_WHITELIST_TOTAL_REQUESTS
-          ? {
-              totalRequests: RATE_LIMITS_WHITELIST_TOTAL_REQUESTS,
-              every: RATE_LIMITS_WHITELIST_EVERY_MILLISECONDS,
-            }
-          : null,
-      blacklist:
-        RATE_LIMITS_BLACKLIST_EVERY_MILLISECONDS ||
-        RATE_LIMITS_BLACKLIST_TOTAL_REQUESTS
-          ? {
-              totalRequests: RATE_LIMITS_WHITELIST_TOTAL_REQUESTS,
-              every: RATE_LIMITS_BLACKLIST_EVERY_MILLISECONDS,
-            }
-          : null,
-    },
-  },
-
-  storage: {
-    type: STORAGE_TYPE,
-    host: STORAGE_HOST,
-    port: STORAGE_PORT,
-    expire: STORAGE_EXPIRE_SECONDS,
-    bucket: STORAGE_AWS_BUCKET,
-    region: STORAGE_AWS_REGION,
-    connectionUrl: `postgres://${STORAGE_USERNAME}:${STORAGE_PASSWORD}@${STORAGE_HOST}:${STORAGE_PORT}/${STORAGE_DB}`,
-    db: STORAGE_DB,
-    user: STORAGE_USERNAME,
-    password: STORAGE_PASSWORD,
-    path: STORAGE_FILEPATH,
-  },
-
-  documents: DOCUMENTS
-    ? DOCUMENTS.split(",").reduce((acc, item) => {
-        const keyAndValueArray = item.replace(/\s/g, "").split("=");
-        return { ...acc, [keyAndValueArray[0]]: keyAndValueArray[1] };
-      }, {})
-    : null,
-};
-
-console.log(JSON.stringify(config));

docker-entrypoint.sh

@@ -1,9 +0,0 @@
-#!/bin/bash
-
-# We use this file to translate environmental variables to .env files used by the application
-
-set -e
-
-node ./docker-entrypoint.js > ./config.js
-
-exec "$@"

lib/document_handler.js

@@ -16,56 +16,34 @@ var DocumentHandler = function(options) {
 DocumentHandler.defaultKeyLength = 10;
 
 // Handle retrieving a document
-DocumentHandler.prototype.handleGet = function(request, response, config) {
+DocumentHandler.prototype.handleGet = function(key, response, skipExpire) {
-  const key = request.params.id.split('.')[0];
-  const skipExpire = !!config.documents[key];
-
   this.store.get(key, function(ret) {
     if (ret) {
       winston.verbose('retrieved document', { key: key });
       response.writeHead(200, { 'content-type': 'application/json' });
-      if (request.method === 'HEAD') {
-        response.end();
-      } else {
       response.end(JSON.stringify({ data: ret, key: key }));
     }
-    }
     else {
       winston.warn('document not found', { key: key });
       response.writeHead(404, { 'content-type': 'application/json' });
-      if (request.method === 'HEAD') {
-        response.end();
-      } else {
       response.end(JSON.stringify({ message: 'Document not found.' }));
     }
-    }
   }, skipExpire);
 };
 
 // Handle retrieving the raw version of a document
-DocumentHandler.prototype.handleRawGet = function(request, response, config) {
+DocumentHandler.prototype.handleRawGet = function(key, response, skipExpire) {
-  const key = request.params.id.split('.')[0];
-  const skipExpire = !!config.documents[key];
-
   this.store.get(key, function(ret) {
     if (ret) {
       winston.verbose('retrieved raw document', { key: key });
-      response.writeHead(200, { 'content-type': 'text/plain; charset=UTF-8' });
+      response.writeHead(200, { 'content-type': 'text/plain' });
-      if (request.method === 'HEAD') {
-        response.end();
-      } else {
       response.end(ret);
     }
-    }
     else {
       winston.warn('raw document not found', { key: key });
       response.writeHead(404, { 'content-type': 'application/json' });
-      if (request.method === 'HEAD') {
-        response.end();
-      } else {
       response.end(JSON.stringify({ message: 'Document not found.' }));
     }
-    }
   }, skipExpire);
 };
 
@@ -91,7 +69,8 @@ DocumentHandler.prototype.handlePost = function (request, response) {
     _this.chooseKey(function (key) {
       _this.store.set(key, buffer, function (res) {
         if (res) {
-          winston.verbose('added document', { key: key });
+          var ip = request.headers['x-forwarded-for'] || request.ip;
+          winston.verbose('added document', { key: key, ip: ip });
           response.writeHead(200, { 'content-type': 'application/json' });
           response.end(JSON.stringify({ key: key }));
         }
@@ -145,7 +124,7 @@ DocumentHandler.prototype.chooseKey = function(callback) {
     } else {
       callback(key);
     }
-  }, true); // Don't bump expirations when key searching
+  });
 };
 
 DocumentHandler.prototype.acceptableKey = function() {

lib/document_stores/amazon-s3.js

@@ -1,56 +0,0 @@
-/*global require,module,process*/
-
-var AWS = require('aws-sdk');
-var winston = require('winston');
-
-var AmazonS3DocumentStore = function(options) {
-  this.expire = options.expire;
-  this.bucket = options.bucket;
-  this.client = new AWS.S3({region: options.region});
-};
-
-AmazonS3DocumentStore.prototype.get = function(key, callback, skipExpire) {
-  var _this = this;
-
-  var req = {
-    Bucket: _this.bucket,
-    Key: key
-  };
-
-  _this.client.getObject(req, function(err, data) {
-    if(err) {
-      callback(false);
-    }
-    else {
-      callback(data.Body.toString('utf-8'));
-      if (_this.expire && !skipExpire) {
-        winston.warn('amazon s3 store cannot set expirations on keys');
-      }
-    }
-  });
-}
-
-AmazonS3DocumentStore.prototype.set = function(key, data, callback, skipExpire) {
-  var _this = this;
-
-  var req = {
-    Bucket: _this.bucket,
-    Key: key,
-    Body: data,
-    ContentType: 'text/plain'
-  };
-
-  _this.client.putObject(req, function(err, data) {
-    if (err) {
-      callback(false);
-    }
-    else {
-      callback(true);
-      if (_this.expire && !skipExpire) {
-        winston.warn('amazon s3 store cannot set expirations on keys');
-      }
-    }
-  });
-}
-
-module.exports = AmazonS3DocumentStore;

lib/document_stores/google-datastore.js

@@ -1,89 +0,0 @@
-/*global require,module,process*/
-
-const Datastore = require('@google-cloud/datastore');
-const winston = require('winston');
-
-class GoogleDatastoreDocumentStore {
-
-  // Create a new store with options
-  constructor(options) {
-    this.kind = "Haste";
-    this.expire = options.expire;
-    this.datastore = new Datastore();
-  }
-
-  // Save file in a key
-  set(key, data, callback, skipExpire) {
-    var expireTime = (skipExpire || this.expire === undefined) ? null : new Date(Date.now() + this.expire * 1000);
-
-    var taskKey = this.datastore.key([this.kind, key])
-    var task = {
-      key: taskKey,
-      data: [
-        {
-          name: 'value',
-          value: data,
-          excludeFromIndexes: true
-        },
-        {
-          name: 'expiration',
-          value: expireTime
-        }
-      ]
-    };
-
-    this.datastore.insert(task).then(() => {
-      callback(true);
-    })
-    .catch(err => {
-      callback(false);
-    });
-  }
-
-  // Get a file from a key
-  get(key, callback, skipExpire) {
-    var taskKey = this.datastore.key([this.kind, key])
-
-    this.datastore.get(taskKey).then((entity) => {
-      if (skipExpire || entity[0]["expiration"] == null) {
-        callback(entity[0]["value"]);
-      }
-      else {
-        // check for expiry
-        if (entity[0]["expiration"] < new Date()) {
-          winston.info("document expired", {key: key, expiration: entity[0]["expiration"], check: new Date(null)});
-          callback(false);
-        }
-        else {
-          // update expiry
-          var task = {
-            key: taskKey,
-            data: [
-              {
-                name: 'value',
-                value: entity[0]["value"],
-                excludeFromIndexes: true
-              },
-              {
-                name: 'expiration',
-                value: new Date(Date.now() + this.expire * 1000)
-              }
-            ]
-          };
-          this.datastore.update(task).then(() => {
-          })
-          .catch(err => {
-            winston.error("failed to update expiration", {error: err});
-          });
-          callback(entity[0]["value"]);
-        }
-      }
-    })
-    .catch(err => {
-        winston.error("Error retrieving value from Google Datastore", {error: err});
-        callback(false);
-    });
-  }
-}
-
-module.exports = GoogleDatastoreDocumentStore;

lib/document_stores/memcached.js

@@ -1,54 +1,45 @@
-const memcached = require('memcached');
+var memcached = require('memcache');
-const winston = require('winston');
+var winston = require('winston');
 
-class MemcachedDocumentStore {
+// Create a new store with options
-
+var MemcachedDocumentStore = function(options) {
-  // Create a new store with options
-  constructor(options) {
   this.expire = options.expire;
-
+  if (!MemcachedDocumentStore.client) {
-    const host = options.host || '127.0.0.1';
+    MemcachedDocumentStore.connect(options);
-    const port = options.port || 11211;
-    const url = `${host}:${port}`;
-    this.connect(url);
   }
+};
 
-  // Create a connection
+// Create a connection
-  connect(url) {
+MemcachedDocumentStore.connect = function(options) {
-    this.client = new memcached(url);
+  var host = options.host || '127.0.0.1';
-
+  var port = options.port || 11211;
-    winston.info(`connecting to memcached on ${url}`);
+  this.client = new memcached.Client(port, host);
-
+  this.client.connect();
-    this.client.on('failure', function(error) {
+  this.client.on('connect', function() {
-      winston.info('error connecting to memcached', {error});
+    winston.info('connected to memcached on ' + host + ':' + port);
   });
-  }
+  this.client.on('error', function(e) {
-
+    winston.info('error connecting to memcached', { error: e });
-  // Save file in a key
-  set(key, data, callback, skipExpire) {
-    this.client.set(key, data, skipExpire ? 0 : this.expire || 0, (error) => {
-      callback(!error);
   });
-  }
+};
 
-  // Get a file from a key
+// Save file in a key
-  get(key, callback, skipExpire) {
+MemcachedDocumentStore.prototype.set =
-    this.client.get(key, (error, data) => {
+function(key, data, callback, skipExpire) {
-      const value = error ? false : data;
+  MemcachedDocumentStore.client.set(key, data, function(err, reply) {
+    err ? callback(false) : callback(true);
+  }, skipExpire ? 0 : this.expire);
+};
 
-      callback(value);
+// Get a file from a key
-
+MemcachedDocumentStore.prototype.get = function(key, callback, skipExpire) {
-      // Update the key so that the expiration is pushed forward
+  var _this = this;
-      if (value && !skipExpire) {
+  MemcachedDocumentStore.client.get(key, function(err, reply) {
-        this.set(key, data, (updateSucceeded) => {
+    callback(err ? false : reply);
-          if (!updateSucceeded) {
+    if (_this.expire && !skipExpire) {
-            winston.error('failed to update expiration on GET', {key});
+      winston.warn('store does not currently push forward expirations on GET');
-          }
-        }, skipExpire);
     }
   });
-  }
+};
-
-}
 
 module.exports = MemcachedDocumentStore;

lib/document_stores/mongo.js

@@ -1,88 +0,0 @@
-
-
-var MongoClient = require('mongodb').MongoClient,
-    winston = require('winston');
-
-var MongoDocumentStore = function (options) {
-    this.expire = options.expire;
-    this.connectionUrl = process.env.DATABASE_URl || options.connectionUrl;
-};
-
-MongoDocumentStore.prototype.set = function (key, data, callback, skipExpire) {
-    var now = Math.floor(new Date().getTime() / 1000),
-        that = this;
-
-    this.safeConnect(function (err, db) {
-        if (err)
-            return callback(false);
-        
-        db.collection('entries').update({
-            'entry_id': key,
-            $or: [
-                { expiration: -1 },
-                { expiration: { $gt: now } }
-            ]
-        }, {
-            'entry_id': key,
-            'value': data,
-            'expiration': that.expire && !skipExpire ? that.expire + now : -1
-        }, {
-            upsert: true
-        }, function (err, existing) {
-            if (err) {
-                winston.error('error persisting value to mongodb', { error: err });
-                return callback(false);
-            }
-
-            callback(true);
-        });
-    });
-};
-
-MongoDocumentStore.prototype.get = function (key, callback, skipExpire) {
-    var now = Math.floor(new Date().getTime() / 1000),
-        that = this;
-
-    this.safeConnect(function (err, db) {
-        if (err)
-            return callback(false);
-        
-        db.collection('entries').findOne({
-            'entry_id': key,
-            $or: [
-                { expiration: -1 },
-                { expiration: { $gt: now } }
-            ]
-        }, function (err, entry) {
-            if (err) {
-                winston.error('error persisting value to mongodb', { error: err });
-                return callback(false);
-            }
-
-            callback(entry === null ? false : entry.value);
-
-            if (entry !== null && entry.expiration !== -1 && that.expire && !skipExpire) {
-                db.collection('entries').update({
-                    'entry_id': key
-                }, {
-                    $set: {
-                        'expiration': that.expire + now
-                    }
-                }, function (err, result) { });
-            }
-        });
-    });
-};
-
-MongoDocumentStore.prototype.safeConnect = function (callback) {
-    MongoClient.connect(this.connectionUrl, function (err, db) {
-        if (err) {
-            winston.error('error connecting to mongodb', { error: err });
-            callback(err);
-        } else {
-            callback(undefined, db);
-        }
-    });
-};
-
-module.exports = MongoDocumentStore;

lib/document_stores/postgres.js

@@ -1,16 +1,14 @@
 /*global require,module,process*/
 
+var postgres = require('pg');
 var winston = require('winston');
-const {Pool} = require('pg');
 
 // create table entries (id serial primary key, key varchar(255) not null, value text not null, expiration int, unique(key));
 
 // A postgres document store
 var PostgresDocumentStore = function (options) {
   this.expireJS = options.expire;
-
+  this.connectionUrl = process.env.DATABASE_URL || options.connectionUrl;
-  const connectionString = process.env.DATABASE_URL || options.connectionUrl;
-  this.pool = new Pool({connectionString});
 };
 
 PostgresDocumentStore.prototype = {
@@ -25,7 +23,7 @@ PostgresDocumentStore.prototype = {
         key,
         data,
         that.expireJS && !skipExpire ? that.expireJS + now : null
-      ], function (err) {
+      ], function (err, result) {
         if (err) {
           winston.error('error persisting value to postgres', { error: err });
           return callback(false);
@@ -52,7 +50,7 @@ PostgresDocumentStore.prototype = {
           client.query('UPDATE entries SET expiration = $1 WHERE ID = $2', [
             that.expireJS + now,
             result.rows[0].id
-          ], function (err) {
+          ], function (err, result) {
             if (!err) {
               done();
             }
@@ -66,15 +64,16 @@ PostgresDocumentStore.prototype = {
 
   // A connection wrapper
   safeConnect: function (callback) {
-    this.pool.connect((error, client, done) => {
+    postgres.connect(this.connectionUrl, function (err, client, done) {
-      if (error) {
+      if (err) {
-        winston.error('error connecting to postgres', {error});
+        winston.error('error connecting to postgres', { error: err });
-        callback(error);
+        callback(err);
       } else {
         callback(undefined, client, done);
       }
     });
   }
+
 };
 
 module.exports = PostgresDocumentStore;

lib/document_stores/redis.js

@@ -29,12 +29,7 @@ RedisDocumentStore.connect = function(options) {
   if (options.password) {
     RedisDocumentStore.client.auth(options.password);
   }
-
+  RedisDocumentStore.client.select(index, function(err, reply) {
-  RedisDocumentStore.client.on('error', function(err) {
-    winston.error('redis disconnected', err);
-  });
-
-  RedisDocumentStore.client.select(index, function(err) {
     if (err) {
       winston.error(
         'error connecting to redis index ' + index,
@@ -51,7 +46,7 @@ RedisDocumentStore.connect = function(options) {
 // Save file in a key
 RedisDocumentStore.prototype.set = function(key, data, callback, skipExpire) {
   var _this = this;
-  RedisDocumentStore.client.set(key, data, function(err) {
+  RedisDocumentStore.client.set(key, data, function(err, reply) {
     if (err) {
       callback(false);
     }
@@ -67,7 +62,7 @@ RedisDocumentStore.prototype.set = function(key, data, callback, skipExpire) {
 // Expire a key in expire time if set
 RedisDocumentStore.prototype.setExpiration = function(key) {
   if (this.expire) {
-    RedisDocumentStore.client.expire(key, this.expire, function(err) {
+    RedisDocumentStore.client.expire(key, this.expire, function(err, reply) {
       if (err) {
         winston.error('failed to set expiry on key: ' + key);
       }

lib/document_stores/rethinkdb.js

@@ -1,46 +0,0 @@
-const crypto = require('crypto');
-const rethink = require('rethinkdbdash');
-const winston = require('winston');
-
-const md5 = (str) => {
-  const md5sum = crypto.createHash('md5');
-  md5sum.update(str);
-  return md5sum.digest('hex');
-};
-
-class RethinkDBStore {
-  constructor(options) {
-    this.client = rethink({
-      silent: true,
-      host: options.host || '127.0.0.1',
-      port: options.port || 28015,
-      db: options.db || 'haste',
-      user: options.user || 'admin',
-      password: options.password || ''
-    });
-  }
-
-  set(key, data, callback) {
-    this.client.table('uploads').insert({ id: md5(key), data: data }).run((error) => {
-      if (error) {
-        callback(false);
-        winston.error('failed to insert to table', error);
-        return;
-      }
-      callback(true);
-    });
-  }
-
-  get(key, callback) {
-    this.client.table('uploads').get(md5(key)).run((error, result) => {
-      if (error || !result) {
-        callback(false);
-        if (error) winston.error('failed to insert to table', error);
-        return;
-      }
-      callback(result.data);
-    });
-  }
-}
-
-module.exports = RethinkDBStore;

lib/key_generators/dictionary.js

@@ -1,32 +0,0 @@
-const fs = require('fs');
-
-module.exports = class DictionaryGenerator {
-
-  constructor(options, readyCallback) {
-    // Check options format
-    if (!options)      throw Error('No options passed to generator');
-    if (!options.path) throw Error('No dictionary path specified in options');
-
-    // Load dictionary
-    fs.readFile(options.path, 'utf8', (err, data) => {
-      if (err) throw err;
-
-      this.dictionary = data.split(/[\n\r]+/);
-
-      if (readyCallback) readyCallback();
-    });
-  }
-
-  // Generates a dictionary-based key, of keyLength words
-  createKey(keyLength) {
-    let text = '';
-
-    for (let i = 0; i < keyLength; i++) {
-      const index = Math.floor(Math.random() * this.dictionary.length);
-      text += this.dictionary[index];
-    }
-
-    return text;
-  }
-
-};

lib/key_generators/phonetic.js

@@ -1,27 +1,33 @@
 // Draws inspiration from pwgen and http://tools.arantius.com/password
-
+var PhoneticKeyGenerator = function(options) {
-const randOf = (collection) => {
+  // No options
-  return () => {
-    return collection[Math.floor(Math.random() * collection.length)];
-  };
 };
 
-// Helper methods to get an random vowel or consonant
+// Generate a phonetic key
-const randVowel = randOf('aeiou');
+PhoneticKeyGenerator.prototype.createKey = function(keyLength) {
-const randConsonant = randOf('bcdfghjklmnpqrstvwxyz');
+  var text = '';
-
+  var start = Math.round(Math.random());
-module.exports = class PhoneticKeyGenerator {
+  for (var i = 0; i < keyLength; i++) {
-
+    text += (i % 2 == start) ? this.randConsonant() : this.randVowel();
-  // Generate a phonetic key of alternating consonant & vowel
-  createKey(keyLength) {
-    let text = '';
-    const start = Math.round(Math.random());
-
-    for (let i = 0; i < keyLength; i++) {
-      text += (i % 2 == start) ? randConsonant() : randVowel();
   }
-
   return text;
-  }
-
 };
+
+PhoneticKeyGenerator.consonants = 'bcdfghjklmnpqrstvwxyz';
+PhoneticKeyGenerator.vowels = 'aeiou';
+
+// Get an random vowel
+PhoneticKeyGenerator.prototype.randVowel = function() {
+  return PhoneticKeyGenerator.vowels[
+    Math.floor(Math.random() * PhoneticKeyGenerator.vowels.length)
+  ];
+};
+
+// Get an random consonant
+PhoneticKeyGenerator.prototype.randConsonant = function() {
+  return PhoneticKeyGenerator.consonants[
+    Math.floor(Math.random() * PhoneticKeyGenerator.consonants.length)
+  ];
+};
+
+module.exports = PhoneticKeyGenerator;

lib/key_generators/random.js

@@ -1,20 +1,19 @@
-module.exports = class RandomKeyGenerator {
+var RandomKeyGenerator = function(options) {
-
+  if (!options) {
-  // Initialize a new generator with the given keySpace
+    options = {};
-  constructor(options = {}) {
-    this.keyspace = options.keyspace || 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
   }
+  this.keyspace = options.keyspace || 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+};
 
-  // Generate a key of the given length
+// Generate a random key
-  createKey(keyLength) {
+RandomKeyGenerator.prototype.createKey = function(keyLength) {
   var text = '';
-
+  var index;
   for (var i = 0; i < keyLength; i++) {
-      const index = Math.floor(Math.random() * this.keyspace.length);
+    index = Math.floor(Math.random() * this.keyspace.length);
     text += this.keyspace.charAt(index);
   }
-
   return text;
-  }
-
 };
+
+module.exports = RandomKeyGenerator;

package.json

@@ -14,21 +14,23 @@
   },
   "main": "haste",
   "dependencies": {
-    "busboy": "0.2.4",
-    "connect": "^3.7.0",
     "connect-ratelimit": "0.0.7",
     "connect-route": "0.1.5",
-    "pg": "^8.0.0",
+    "connect": "3.4.1",
-    "redis": "0.8.1",
+    "st": "1.1.0",
-    "redis-url": "0.1.0",
+    "winston": "0.6.2",
-    "st": "^2.0.0",
+    "uglify-js": "1.3.3",
-    "uglify-js": "3.1.6",
+    "busboy": "0.2.4",
-    "winston": "^2.0.0"
+    "pg": "4.1.1"
   },
   "devDependencies": {
-    "mocha": "^8.1.3"
+    "mocha": "*",
+    "should": "*"
   },
   "bundledDependencies": [],
+  "engines": {
+    "node": "0.10.35"
+  },
   "bin": {
     "haste-server": "./server.js"
   },
@@ -42,6 +44,6 @@
   },
   "scripts": {
     "start": "node server.js",
-    "test": "mocha --recursive"
+    "test": "mocha -r should spec/*"
   }
 }

server.js

@@ -1,8 +1,7 @@
-// vim: set ts=2 sw=2 sts=2 et:
 var http = require('http');
+var url = require('url');
 var fs = require('fs');
 
-var uglify = require('uglify-js');
 var winston = require('winston');
 var connect = require('connect');
 var route = require('connect-route');
@@ -12,7 +11,7 @@ var connect_rate_limit = require('connect-ratelimit');
 var DocumentHandler = require('./lib/document_handler');
 
 // Load the configuration and set some defaults
-var config = require('./config.json');
+var config = JSON.parse(fs.readFileSync('./config.js', 'utf8'));
 config.port = process.env.PORT || config.port || 7777;
 config.host = process.env.HOST || config.host || 'localhost';
 
@@ -20,10 +19,7 @@ config.host = process.env.HOST || config.host || 'localhost';
 if (config.logging) {
   try {
     winston.remove(winston.transports.Console);
-  } catch(e) {
+  } catch(er) { }
-    /* was not present */
-  }
-
   var detail, type;
   for (var i = 0; i < config.logging.length; i++) {
     detail = config.logging[i];
@@ -56,14 +52,21 @@ else {
 
 // Compress the static javascript assets
 if (config.recompressStaticAssets) {
+  var jsp = require("uglify-js").parser;
+  var pro = require("uglify-js").uglify;
   var list = fs.readdirSync('./static');
-  for (var j = 0; j < list.length; j++) {
+  for (var i = 0; i < list.length; i++) {
-    var item = list[j];
+    var item = list[i];
-    if ((item.indexOf('.js') === item.length - 3) && (item.indexOf('.min.js') === -1)) {
+    var orig_code, ast;
-      var dest = item.substring(0, item.length - 3) + '.min' + item.substring(item.length - 3);
+    if ((item.indexOf('.js') === item.length - 3) &&
-      var orig_code = fs.readFileSync('./static/' + item, 'utf8');
+        (item.indexOf('.min.js') === -1)) {
-
+      dest = item.substring(0, item.length - 3) + '.min' +
-      fs.writeFileSync('./static/' + dest, uglify.minify(orig_code).code, 'utf8');
+        item.substring(item.length - 3);
+      orig_code = fs.readFileSync('./static/' + item, 'utf8');
+      ast = jsp.parse(orig_code);
+      ast = pro.ast_mangle(ast);
+      ast = pro.ast_squeeze(ast);
+      fs.writeFileSync('./static/' + dest, pro.gen_code(ast), 'utf8');
       winston.info('compressed ' + item + ' into ' + dest);
     }
   }
@@ -107,30 +110,23 @@ if (config.rateLimits) {
   app.use(connect_rate_limit(config.rateLimits));
 }
 
-function raw(request, response) {
-  return documentHandler.handleRawGet(request, response, config);
-}
-
 // first look at API calls
 app.use(route(function(router) {
   // get raw documents - support getting with extension
-  router.get('/raw/:id', raw);
+  router.get('/raw/:id', function(request, response, next) {
-  router.get('/:id/raw', raw);
+    var key = request.params.id.split('.')[0];
-  router.head('/raw/:id', raw);
+    var skipExpire = !!config.documents[key];
-  router.head('/:id/raw', raw);
+    return documentHandler.handleRawGet(key, response, skipExpire);
+  });
   // add documents
-
+  router.post('/documents', function(request, response, next) {
-  router.post('/documents', function(request, response) {
     return documentHandler.handlePost(request, response);
   });
-
   // get documents
-  router.get('/documents/:id', function(request, response) {
+  router.get('/documents/:id', function(request, response, next) {
-    return documentHandler.handleGet(request, response, config);
+    var key = request.params.id.split('.')[0];
-  });
+    var skipExpire = !!config.documents[key];
-
+    return documentHandler.handleGet(key, response, skipExpire);
-  router.head('/documents/:id', function(request, response) {
-    return documentHandler.handleGet(request, response, config);
   });
 }));
 
@@ -146,12 +142,8 @@ app.use(connect_st({
 // so route it back to /
 app.use(route(function(router) {
   router.get('/:id', function(request, response, next) {
-    if (request.headers.accept && request.headers.accept.includes('html')) {
     request.sturl = '/';
     next();
-    } else {
-      return raw(request, response);
-    }
   });
 }));
 

spec/document_handler_spec.js

@@ -1,7 +1,3 @@
-/* global describe, it */
-
-var assert = require('assert');
-
 var DocumentHandler = require('../lib/document_handler');
 var Generator = require('../lib/key_generators/random');
 
@@ -12,13 +8,13 @@ describe('document_handler', function() {
     it('should choose a key of the proper length', function() {
       var gen = new Generator();
       var dh = new DocumentHandler({ keyLength: 6, keyGenerator: gen });
-      assert.equal(6, dh.acceptableKey().length);
+      dh.acceptableKey().length.should.equal(6);
     });
 
     it('should choose a default key length', function() {
       var gen = new Generator();
       var dh = new DocumentHandler({ keyGenerator: gen });
-      assert.equal(dh.keyLength, DocumentHandler.defaultKeyLength);
+      dh.keyLength.should.equal(DocumentHandler.defaultKeyLength);
     });
 
   });

spec/redis_document_store_spec.js

@@ -1,12 +1,8 @@
-/* global it, describe, afterEach */
+var RedisDocumentStore = require('../lib/document_stores/redis');
-
-var assert = require('assert');
 
 var winston = require('winston');
 winston.remove(winston.transports.Console);
 
-var RedisDocumentStore = require('../lib/document_stores/redis');
-
 describe('redis_document_store', function() {
 
   /* reconnect to redis on each test */
@@ -23,7 +19,7 @@ describe('redis_document_store', function() {
       var store = new RedisDocumentStore({ expire: 10 });
       store.set('hello1', 'world', function() {
         RedisDocumentStore.client.ttl('hello1', function(err, res) {
-          assert.ok(res > 1);
+          res.should.be.above(1);
           done();
         });
       });
@@ -33,7 +29,7 @@ describe('redis_document_store', function() {
       var store = new RedisDocumentStore({ expire: 10 });
       store.set('hello2', 'world', function() {
         RedisDocumentStore.client.ttl('hello2', function(err, res) {
-          assert.equal(-1, res);
+          res.should.equal(-1);
           done();
         });
       }, true);
@@ -41,9 +37,9 @@ describe('redis_document_store', function() {
 
     it('should not set an expiration when expiration is off', function(done) {
       var store = new RedisDocumentStore({ expire: false });
-      store.set('hello3', 'world', function() {
+      store.set('hello3', 'world', function(worked) {
         RedisDocumentStore.client.ttl('hello3', function(err, res) {
-          assert.equal(-1, res);
+          res.should.equal(-1);
           done();
         });
       });

static/application.css

@@ -1,5 +1,5 @@
 body {
-	background: #fcfcfc;
+	background: #002B36;
 	padding: 20px 50px;
 	margin: 0px;
 }
@@ -9,7 +9,7 @@ body {
 textarea {
 	background: transparent;
 	border: 0px;
-	color: #000;
+	color: #fff;
 	padding: 0px;
 	width: 100%;
 	height: 100%;
@@ -17,8 +17,6 @@ textarea {
 	outline: none;
 	resize: none;
 	font-size: 13px;
-	margin-top: 0;
-	margin-bottom: 0;
 }
 
 /* the line numbers */
@@ -27,13 +25,12 @@ textarea {
   color: #7d7d7d;
 	z-index: -1000;
 	position: absolute;
-	/* top: 20px; */
+	top: 20px;
 	left: 0px;
 	width: 30px; /* 30 to get 20 away from box */
 	font-size: 13px;
 	font-family: monospace;
 	text-align: right;
-	user-select: none;
 }
 
 /* code box when locked */
@@ -45,8 +42,8 @@ textarea {
 	border: 0px;
 	outline: none;
 	font-size: 13px;
+	padding-right: 360px;
   overflow: inherit;
-	background: #fcfcfc;
 }
 
 #box code {
@@ -57,35 +54,32 @@ textarea {
 /* key */
 
 #key {
-	display: flex;
+	position: fixed;
-	justify-content: space-between;
+	top: 0px;
-	width: 100%;
+	right: 0px;
-	position: sticky;
+	z-index: +1000; /* watch out */
-	flex-wrap: row;
 }
+
 #box1 {
 	padding: 5px;
 	text-align: center;
-	background: #fcfcfc;
+	background: #00222b;
 }
 
 #box2 {
-	display: flex;
+	background: #08323c;
-	justify-content: right;
-	background: #fcfcfc;
 	font-size: 0px;
 	padding: 0px 5px;
 }
 
-a.logo, a.logo:visited {
+#box1 a.logo, #box1 a.logo:visited {
 	display: inline-block;
 	background: url(logo.png);
 	width: 126px;
-	min-width: 126px;
 	height: 42px;
 }
 
-a.logo:hover {
+#box1 a.logo:hover {
 	background-position: 0 bottom;
 }
 
@@ -119,26 +113,18 @@ a.logo:hover {
 }
 
 #box3, #messages li {
-	position: absolute;
+	background: #173e48;
-	right: 100px;
-	background: #fcfcfc;
 	font-family: Helvetica, sans-serif;
 	font-size: 12px;
 	line-height: 14px;
 	padding: 10px 15px;
-	user-select: none;
 }
 
-#box3 .label {
+#box3 .label, #messages li {
-	color: #000;
+	color: #fff;
 	font-weight: bold;
 }
 
-#messages li {
-	color: #FFF;
-	right: 50px;
-}
-
 #box3 .shortcut {
 	color: #c4dce3;
 	font-weight: normal;
@@ -166,12 +152,16 @@ a.logo:hover {
 #box2 .button-picture{ border-width: 0; font-size: inherit; }
 
 #messages {
+	position:fixed;
+	top:0px;
+	right:138px;
 	margin:0;
 	padding:0;
+	width:400px;
 }
 
 #messages li {
-	background:rgba(252,252,252,0.8);
+	background:rgba(23,62,72,0.8);
 	margin:0 auto;
 	list-style:none;
 }

static/application.js

@@ -1,5 +1,3 @@
-/* global $, hljs, window, document */
-
 ///// represents a single document
 
 var haste_document = function() {
@@ -44,10 +42,10 @@ haste_document.prototype.load = function(key, callback, lang) {
         value: high.value,
         key: key,
         language: high.language || lang,
-        lineCount: res.data.split('\n').length
+        lineCount: res.data.split("\n").length
       });
     },
-    error: function() {
+    error: function(err) {
       callback(false);
     }
   });
@@ -64,7 +62,7 @@ haste_document.prototype.save = function(data, callback) {
     type: 'post',
     data: data,
     dataType: 'json',
-    contentType: 'text/plain; charset=utf-8',
+    contentType: 'application/json; charset=utf-8',
     success: function(res) {
       _this.locked = true;
       _this.key = res.key;
@@ -73,7 +71,7 @@ haste_document.prototype.save = function(data, callback) {
         value: high.value,
         key: res.key,
         language: high.language,
-        lineCount: data.split('\n').length
+        lineCount: data.split("\n").length
       });
     },
     error: function(res) {
@@ -170,7 +168,8 @@ haste.extensionMap = {
   lua: 'lua', pas: 'delphi', java: 'java', cpp: 'cpp', cc: 'cpp', m: 'objectivec',
   vala: 'vala', sql: 'sql', sm: 'smalltalk', lisp: 'lisp', ini: 'ini',
   diff: 'diff', bash: 'bash', sh: 'bash', tex: 'tex', erl: 'erlang', hs: 'haskell',
-  md: 'markdown', txt: '', coffee: 'coffee', swift: 'swift'
+  md: 'markdown', txt: '', coffee: 'coffee', json: 'javascript',
+  swift: 'swift'
 };
 
 // Look up the extension preferred for a type
@@ -277,7 +276,7 @@ haste.prototype.configureButtons = function() {
       $where: $('#box2 .new'),
       label: 'New',
       shortcut: function(evt) {
-        return evt.ctrlKey && evt.keyCode === 78;
+        return evt.ctrlKey && evt.keyCode === 78  
       },
       shortcutDescription: 'control + n',
       action: function() {
@@ -332,14 +331,14 @@ haste.prototype.configureButton = function(options) {
     }
   });
   // Show the label
-  options.$where.mouseenter(function() {
+  options.$where.mouseenter(function(evt) {
     $('#box3 .label').text(options.label);
     $('#box3 .shortcut').text(options.shortcutDescription || '');
     $('#box3').show();
     $(this).append($('#pointer').remove().show());
   });
   // Hide the label
-  options.$where.mouseleave(function() {
+  options.$where.mouseleave(function(evt) {
     $('#box3').hide();
     $('#pointer').hide();
   });
@@ -372,7 +371,7 @@ $(function() {
       // For browsers like Internet Explorer
       if (document.selection) {
         this.focus();
-        var sel = document.selection.createRange();
+        sel = document.selection.createRange();
         sel.text = myValue;
         this.focus();
       }

static/index.html

@@ -1,12 +1,13 @@
 <html>
+
 	<head>
-		<title>Webionite hastebin</title>
+
-		<meta name="viewport" content="width=device-width, initial-scale=1.0">
+		<title>hastebin</title>
 		<meta charset="utf-8" />
-		<link rel="stylesheet" type="text/css" href="tomorrow.css"/>
+		<link rel="stylesheet" type="text/css" href="solarized_dark.css"/>
 		<link rel="stylesheet" type="text/css" href="application.css"/>
 
-		<script type="text/javascript" src="jquery.min.js"></script>
+		<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
 		<script type="text/javascript" src="highlight.min.js"></script>
 		<script type="text/javascript" src="application.min.js"></script>
 
@@ -38,27 +39,30 @@
 	</head>
 
 	<body>
+		<ul id="messages"></ul>
 
 		<div id="key">
-			<a href="/about.md" class="logo"></a>
-			<div>
 		  <div id="pointer" style="display:none;"></div>
+			<div id="box1">
+				<a href="/about.md" class="logo"></a>
+			</div>
 			<div id="box2">
 				<button class="save function button-picture">Save</button>
 				<button class="new function button-picture">New</button>
-					<button class="duplicate function button-picture">Duplicate &amp; Edit</button>
+				<button class="duplicate function button-picture">Duplicate & Edit</button>
 				<button class="raw function button-picture">Just Text</button>
+				<button class="twitter function button-picture">Twitter</button>
 			</div>
 			<div id="box3" style="display:none;">
 				<div class="label"></div>
 				<div class="shortcut"></div>
 			</div>
-				<ul id="messages"></ul>
-			</div>
 		</div>
 
 		<div id="linenos"></div>
 		<pre id="box" style="display:none;" class="hljs" tabindex="0"><code></code></pre>
 		<textarea spellcheck="false" style="display:none;"></textarea>
+
 	</body>
+
 </html>

static/solarized_dark.css

@@ -0,0 +1,84 @@
+/*
+
+Orginal Style from ethanschoonover.com/solarized (c) Jeremy Hull <sourdrums@gmail.com>
+
+*/
+
+.hljs {
+  display: block;
+  overflow-x: auto;
+  padding: 0.5em;
+  background: #002b36;
+  color: #839496;
+}
+
+.hljs-comment,
+.hljs-quote {
+  color: #586e75;
+}
+
+/* Solarized Green */
+.hljs-keyword,
+.hljs-selector-tag,
+.hljs-addition {
+  color: #859900;
+}
+
+/* Solarized Cyan */
+.hljs-number,
+.hljs-string,
+.hljs-meta .hljs-meta-string,
+.hljs-literal,
+.hljs-doctag,
+.hljs-regexp {
+  color: #2aa198;
+}
+
+/* Solarized Blue */
+.hljs-title,
+.hljs-section,
+.hljs-name,
+.hljs-selector-id,
+.hljs-selector-class {
+  color: #268bd2;
+}
+
+/* Solarized Yellow */
+.hljs-attribute,
+.hljs-attr,
+.hljs-variable,
+.hljs-template-variable,
+.hljs-class .hljs-title,
+.hljs-type {
+  color: #b58900;
+}
+
+/* Solarized Orange */
+.hljs-symbol,
+.hljs-bullet,
+.hljs-subst,
+.hljs-meta,
+.hljs-meta .hljs-keyword,
+.hljs-selector-attr,
+.hljs-selector-pseudo,
+.hljs-link {
+  color: #cb4b16;
+}
+
+/* Solarized Red */
+.hljs-built_in,
+.hljs-deletion {
+  color: #dc322f;
+}
+
+.hljs-formula {
+  background: #073642;
+}
+
+.hljs-emphasis {
+  font-style: italic;
+}
+
+.hljs-strong {
+  font-weight: bold;
+}

static/tomorrow.css

@@ -1,72 +0,0 @@
-/* http://jmblog.github.com/color-themes-for-google-code-highlightjs */
-
-/* Tomorrow Comment */
-.hljs-comment,
-.hljs-quote {
-  color: #8e908c;
-}
-
-/* Tomorrow Red */
-.hljs-variable,
-.hljs-template-variable,
-.hljs-tag,
-.hljs-name,
-.hljs-selector-id,
-.hljs-selector-class,
-.hljs-regexp,
-.hljs-deletion {
-  color: #c82829;
-}
-
-/* Tomorrow Orange */
-.hljs-number,
-.hljs-built_in,
-.hljs-builtin-name,
-.hljs-literal,
-.hljs-type,
-.hljs-params,
-.hljs-meta,
-.hljs-link {
-  color: #f5871f;
-}
-
-/* Tomorrow Yellow */
-.hljs-attribute {
-  color: #eab700;
-}
-
-/* Tomorrow Green */
-.hljs-string,
-.hljs-symbol,
-.hljs-bullet,
-.hljs-addition {
-  color: #718c00;
-}
-
-/* Tomorrow Blue */
-.hljs-title,
-.hljs-section {
-  color: #4271ae;
-}
-
-/* Tomorrow Purple */
-.hljs-keyword,
-.hljs-selector-tag {
-  color: #8959a8;
-}
-
-.hljs {
-  display: block;
-  overflow-x: auto;
-  background: white;
-  color: #4d4d4c;
-  padding: 0.5em;
-}
-
-.hljs-emphasis {
-  font-style: italic;
-}
-
-.hljs-strong {
-  font-weight: bold;
-}

test/key_generators/dictionary_spec.js

@@ -1,33 +0,0 @@
-/* global describe, it */
-
-const assert = require('assert');
-
-const fs = require('fs');
-
-const Generator = require('../../lib/key_generators/dictionary');
-
-describe('RandomKeyGenerator', function() {
-  describe('randomKey', function() {
-    it('should throw an error if given no options', () => {
-      assert.throws(() => {
-        new Generator();
-      }, Error);
-    });
-
-    it('should throw an error if given no path', () => {
-      assert.throws(() => {
-        new Generator({});
-      }, Error);
-    });
-
-    it('should return a key of the proper number of words from the given dictionary', () => {
-      const path = '/tmp/haste-server-test-dictionary';
-      const words = ['cat'];
-      fs.writeFileSync(path, words.join('\n'));
-
-      const gen = new Generator({path}, () => {
-        assert.equal('catcatcat', gen.createKey(3));
-      });
-    });
-  });
-});

test/key_generators/phonetic_spec.js

@@ -1,27 +0,0 @@
-/* global describe, it */
-
-const assert = require('assert');
-
-const Generator = require('../../lib/key_generators/phonetic');
-
-const vowels = 'aeiou';
-const consonants = 'bcdfghjklmnpqrstvwxyz';
-
-describe('RandomKeyGenerator', () => {
-  describe('randomKey', () => {
-    it('should return a key of the proper length', () => {
-      const gen = new Generator();
-      assert.equal(6, gen.createKey(6).length);
-    });
-
-    it('should alternate consonants and vowels', () => {
-      const gen = new Generator();
-
-      const key = gen.createKey(3);
-
-      assert.ok(consonants.includes(key[0]));
-      assert.ok(consonants.includes(key[2]));
-      assert.ok(vowels.includes(key[1]));
-    });
-  });
-});

test/key_generators/random_spec.js

@@ -1,19 +0,0 @@
-/* global describe, it */
-
-const assert = require('assert');
-
-const Generator = require('../../lib/key_generators/random');
-
-describe('RandomKeyGenerator', () => {
-  describe('randomKey', () => {
-    it('should return a key of the proper length', () => {
-      const gen = new Generator();
-      assert.equal(6, gen.createKey(6).length);
-    });
-
-    it('should use a key from the given keyset if given', () => {
-      const gen = new Generator({keyspace: 'A'});
-      assert.equal('AAAAAA', gen.createKey(6));
-    });
-  });
-});