Clean up the lingo to prepare for refactoring.

client/Actions.js

@@ -6,10 +6,10 @@ export default alt.createActions(class Actions {
       'download',
       'receiveData',
       'requestDownload',
-      'setDownloadInfo',
       'sendToDownloader',
-      'updatePeerID',
+      'setDownloadInfo',
-      'updateToken',
+      'setPeerID',
+      'setUploadToken',
       'upload'
     )
   }

client/App.js

@@ -37,8 +37,8 @@ export default class App extends React.Component {
     if (this.state.readyToUpload) {
       return (
         <div>
-          <FileDescription file={this.state.file} />
+          <FileDescription file={this.state.uploadFile} />
-          <Tempalink token={this.state.token} />
+          <Tempalink token={this.state.uploadToken} />
         </div>
       );
 

client/Store.js

@@ -1,14 +1,13 @@
 import Actions from './Actions';
+import ChunkedBlob from './ChunkedBlob';
 import alt from './alt';
 import peer from './peer';
 import socket from './socket';
-import ChunkedBlob from './ChunkedBlob';
 
 const chunkSize = 1024;
 
 function downloadFile(name, blob) {
   let url = URL.createObjectURL(blob);
-
   let a = document.createElement('a');
   a.download = name;
   a.href = url;
@@ -23,8 +22,8 @@ export default alt.createStore(class Store {
 
     this.peerID = null;
 
-    this.token = null;
+    this.uploadToken = null;
-    this.file = null;
+    this.uploadFile = null;
     this.readyToUpload = false;
 
     this.downloadToken = null;
@@ -34,22 +33,22 @@ export default alt.createStore(class Store {
   }
 
   updateReadyStatus() {
-    this.readyToUpload = !!this.peerID && !!this.token && !!this.file;
+    this.readyToUpload = !!this.peerID && !!this.uploadToken && !!this.uploadFile;
     this.readyToDownload = !!this.peerID && !!this.downloadToken && !!this.downloadMetadata;
   }
 
-  onUpdatePeerID(id) {
+  onSetPeerID(id) {
     this.peerID = id;
     this.updateReadyStatus();
   }
 
-  onUpdateToken(token) {
+  onSetUploadToken(token) {
-    this.token = token;
+    this.uploadToken = token;
     this.updateReadyStatus();
   }
 
   onUpload(file) {
-    this.file = file;
+    this.uploadFile = file;
     this.updateReadyStatus();
 
     socket.emit('upload', {
@@ -77,7 +76,7 @@ export default alt.createStore(class Store {
   onSendToDownloader(peerID) {
     if (!this.readyToUpload) return;
 
-    let file = this.file;
+    let file = this.uploadFile;
     let conn = peer.connect(peerID);
     conn.on('open', function () {
       let chunks = Math.ceil(file.size / chunkSize);

client/peer.js

@@ -4,8 +4,7 @@ import Peer from 'peerjs';
 var peer = module.exports = new Peer({ key: '8w3x9m637e0o1or' });
 
 peer.on('open', function () {
-  Actions.updatePeerID(peer.id);
+  Actions.setPeerID(peer.id);
-  if (window.token) Actions.requestDownload(window.token);
 });
 
 peer.on('connection', function (conn) {

client/socket.js

@@ -4,7 +4,7 @@ import Actions from './Actions';
 var socket = module.exports = io.connect(window.location.origin);
 
 socket.on('token', function (token) {
-  Actions.updateToken(token);
+  Actions.setUploadToken(token);
 });
 
 socket.on('download', function (peerID) {

server/index.js

@@ -2,6 +2,7 @@ var Upload = require('./Upload');
 var express = require('express');
 var http = require('http');
 var path = require('path');
+var routes = require('./routes');
 var socketIO = require('socket.io');
 
 var app = express();
@@ -16,20 +17,7 @@ server.listen(process.env.PORT || 3000, function () {
 
 app.set('view engine', 'ejs');
 app.set('views', path.resolve(__dirname, '../views'));
-
+app.use(routes);
-app.get('/', function (req, res) {
-  res.render('index');
-});
-
-app.get('/d/:token', function (req, res) {
-  var uploader = Upload.find(req.params.token);
-  res.render('download', {
-    token: uploader.token,
-    meta: uploader.metadata
-  });
-});
-
-app.use(express.static(__dirname + '/../static'));
 
 io.on('connection', function (socket) {
 
@@ -43,6 +31,7 @@ io.on('connection', function (socket) {
 
   socket.on('download', function (data) {
     var uploader = Upload.find(data.token);
+    if (!uploader) return;
     uploader.socket.emit('download', data.peerID);
   });
 

server/routes.js

@@ -0,0 +1,44 @@
+var Upload = require('./Upload');
+var express = require('express');
+
+var router = module.exports = new express.Router();
+
+router.get('/', function (req, res) {
+  res.render('index');
+});
+
+router.get('/d/:token', function (req, res, next) {
+
+  var uploader = Upload.find(req.params.token);
+  if (uploader) {
+    res.render('download', {
+      token: uploader.token,
+      meta: uploader.metadata
+    });
+  } else {
+    var err = new Error('Unknown token');
+    err.status = 404;
+    next(err);
+  }
+
+});
+
+router.use(express.static(__dirname + '/../static'));
+
+router.use(function (req, res, next) {
+  var err = new Error('Not Found');
+  err.status = 404;
+  next(err);
+});
+
+router.use(function (err, req, res, next) {
+
+  var status = err.status || 500;
+  var message = err.message || '';
+
+  res.status(status).render('error', {
+    status: status,
+    message: message
+  });
+
+});

views/error.ejs

@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html lang="en">
+
+    <head>
+        <meta charset="utf-8">
+        <title>WebDrop | <%= status %></title>
+
+        <link rel="stylesheet" href="index.css">
+        <script src="/socket.io/socket.io.js"></script>
+    </head>
+
+    <body>
+        <%= message %>
+    </body>
+
+</html>

views/index.ejs

@@ -3,11 +3,10 @@
 
     <head>
         <meta charset="utf-8">
-        <title>webdrop</title>
+        <title>WebDrop - Send Files, Easily</title>
 
         <link rel="stylesheet" href="index.css">
         <script src="/socket.io/socket.io.js"></script>
-        <script src="https://cdn.firebase.com/js/client/2.2.1/firebase.js"></script>
     </head>
 
     <body>