From 4ad331750cb12e59d93be4b2fb071c2cbbea4127 Mon Sep 17 00:00:00 2001 From: Loaye Date: Tue, 25 Jul 2017 15:01:08 -0700 Subject: [PATCH 01/16] SCAFFOLD: Builds initial scaffold and body parser --- .eslintignore | 5 ++ .eslintrc | 21 +++++++ .gitignore | 136 ++++++++++++++++++++++++++++++++++++++++++++++ lib/parse-body.js | 21 +++++++ package.json | 24 ++++++++ server.js | 0 6 files changed, 207 insertions(+) create mode 100644 .eslintignore create mode 100644 .eslintrc create mode 100644 .gitignore create mode 100644 lib/parse-body.js create mode 100644 package.json create mode 100644 server.js diff --git a/.eslintignore b/.eslintignore new file mode 100644 index 0000000..82ff623 --- /dev/null +++ b/.eslintignore @@ -0,0 +1,5 @@ +**/node_modules/* +**/vendor/* +**/*.min.js +**/coverage/* +**/build/* \ No newline at end of file diff --git a/.eslintrc b/.eslintrc new file mode 100644 index 0000000..8dc6807 --- /dev/null +++ b/.eslintrc @@ -0,0 +1,21 @@ +{ + "rules": { + "no-console": "off", + "indent": [ "error", 2 ], + "quotes": [ "error", "single" ], + "semi": ["error", "always"], + "linebreak-style": [ "error", "unix" ] + }, + "env": { + "es6": true, + "node": true, + "mocha": true, + "jasmine": true + }, + "ecmaFeatures": { + "modules": true, + "experimentalObjectRestSpread": true, + "impliedStrict": true + }, + "extends": "eslint:recommended" +} diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..393ef53 --- /dev/null +++ b/.gitignore @@ -0,0 +1,136 @@ +# Created by https://www.gitignore.io/api/osx,vim,node,macos,windows + +### macOS ### +*.DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon + +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns +.com.apple.timemachine.donotpresent + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk + +### Node ### +# Logs +logs +*.log +npm-debug.log* +yarn-debug.log* +yarn-error.log* + +# Runtime data +pids +*.pid +*.seed +*.pid.lock + +# Directory for instrumented libs generated by jscoverage/JSCover +lib-cov + +# Coverage directory used by tools like istanbul +coverage + +# nyc test coverage +.nyc_output + +# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files) +.grunt + +# Bower dependency directory (https://bower.io/) +bower_components + +# node-waf configuration +.lock-wscript + +# Compiled binary addons (http://nodejs.org/api/addons.html) +build/Release + +# Dependency directories +node_modules/ +jspm_packages/ + +# Typescript v1 declaration files +typings/ + +# Optional npm cache directory +.npm + +# Optional eslint cache +.eslintcache + +# Optional REPL history +.node_repl_history + +# Output of 'npm pack' +*.tgz + +# Yarn Integrity file +.yarn-integrity + +# dotenv environment variables file +.env + + +### OSX ### + +# Icon must end with two \r + +# Thumbnails + +# Files that might appear in the root of a volume + +# Directories potentially created on remote AFP share + +### Vim ### +# swap +[._]*.s[a-v][a-z] +[._]*.sw[a-p] +[._]s[a-v][a-z] +[._]sw[a-p] +# session +Session.vim +# temporary +.netrwhist +*~ +# auto-generated tag files +tags + +### Windows ### +# Windows thumbnail cache files +Thumbs.db +ehthumbs.db +ehthumbs_vista.db + +# Folder config file +Desktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Windows Installer files +*.cab +*.msi +*.msm +*.msp + +# Windows shortcuts +*.lnk + +# End of https://www.gitignore.io/api/osx,vim,node,macos,windows \ No newline at end of file diff --git a/lib/parse-body.js b/lib/parse-body.js new file mode 100644 index 0000000..0c1d1c0 --- /dev/null +++ b/lib/parse-body.js @@ -0,0 +1,21 @@ +'use strict'; + +module.exports = function(req, callback) { + req.body = ''; + + req.on('data', function(data) { + req.body += data.toString(); + }); + + req.on('end', function() { + try { + req.body = JSON.parse(req.body); + callback(null, req.body); + } catch(err) { + callback(err); + } + }); +}; + + + diff --git a/package.json b/package.json new file mode 100644 index 0000000..feed476 --- /dev/null +++ b/package.json @@ -0,0 +1,24 @@ +{ + "name": "07-http_servers", + "version": "1.0.0", + "description": "![cf](https://i.imgur.com/7v5ASc8.png) Lab 07: Vanilla HTTP Server ======", + "main": "server.js", + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1", + "start": "node server.js" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/Loaye/07-http_servers.git" + }, + "keywords": [], + "author": "", + "license": "ISC", + "bugs": { + "url": "https://github.com/Loaye/07-http_servers/issues" + }, + "homepage": "https://github.com/Loaye/07-http_servers#readme", + "dependencies": { + "cowsay": "^1.1.9" + } +} diff --git a/server.js b/server.js new file mode 100644 index 0000000..e69de29 From 93e27b02681959596d3aa45473a957aba1463642 Mon Sep 17 00:00:00 2001 From: Loaye Date: Tue, 25 Jul 2017 15:38:45 -0700 Subject: [PATCH 02/16] SERVER: adds post and get methods --- server.js | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/server.js b/server.js index e69de29..ca10ab4 100644 --- a/server.js +++ b/server.js @@ -0,0 +1,33 @@ +' use strict'; + +const http = require('http'); +const url = require('url'); +const querystring = require('querystring'); +const cowsay = require('cowsay'); +const parseBody = require('./lib/parse-body.js'); +const PORT = process.env.PORT || 3000; + +const server = http.createServer(function(req, res) { + req.url = req.parse(req.url); + req.url.query = querystring.url.parse(req.url.query); + + if(req.method === 'POST') { + parseBody(req, (err) => { + if(err) return console.error(err); + console.log('POST request body:', req.body); + }); + } + + if(req.method === 'GET' && req.url.pathname === '/cowsay') { + let params = req.url.query; + console.log('querystring params:', params); + res.write(cowsay.say({text: params.text})); + res.end(); + } + + res.end(); +}); + +server.listen(PORT, function() { + console.log('Server on PORT:', PORT); +}); \ No newline at end of file From cc1a2ce5565fe0e430e7e29332aa39f27b6a7a9e Mon Sep 17 00:00:00 2001 From: Loaye Date: Tue, 25 Jul 2017 15:48:14 -0700 Subject: [PATCH 03/16] changes fat arrow to function --- server.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server.js b/server.js index ca10ab4..db02a49 100644 --- a/server.js +++ b/server.js @@ -12,7 +12,7 @@ const server = http.createServer(function(req, res) { req.url.query = querystring.url.parse(req.url.query); if(req.method === 'POST') { - parseBody(req, (err) => { + parseBody(req, function(err) { if(err) return console.error(err); console.log('POST request body:', req.body); }); From ce5b394add17f64ed55d2124b5ad60ee02c82111 Mon Sep 17 00:00:00 2001 From: Loaye Date: Tue, 25 Jul 2017 15:57:53 -0700 Subject: [PATCH 04/16] blah --- server.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server.js b/server.js index db02a49..ed97ea5 100644 --- a/server.js +++ b/server.js @@ -21,7 +21,7 @@ const server = http.createServer(function(req, res) { if(req.method === 'GET' && req.url.pathname === '/cowsay') { let params = req.url.query; console.log('querystring params:', params); - res.write(cowsay.say({text: params.text})); + res.write(cowsay.say({text: 'HELLO!!'})); res.end(); } From 5c7b3db8d0e66977734ef64f89654523a518fbed Mon Sep 17 00:00:00 2001 From: Loaye Date: Tue, 25 Jul 2017 16:53:03 -0700 Subject: [PATCH 05/16] POST: adds post method --- server.js | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/server.js b/server.js index ed97ea5..7530829 100644 --- a/server.js +++ b/server.js @@ -1,4 +1,4 @@ -' use strict'; +'use strict'; const http = require('http'); const url = require('url'); @@ -8,26 +8,31 @@ const parseBody = require('./lib/parse-body.js'); const PORT = process.env.PORT || 3000; const server = http.createServer(function(req, res) { - req.url = req.parse(req.url); - req.url.query = querystring.url.parse(req.url.query); + req.url = url.parse(req.url); + req.url.query = querystring.parse(req.url.query); if(req.method === 'POST') { parseBody(req, function(err) { if(err) return console.error(err); - console.log('POST request body:', req.body); + if(req.body.text) { + res.statusCode = 200; + res.writeHead({'Content-Type': 'text/plain'}); + res.write(cowsay.say({text: req.body.text})); + } else { + res.statusCode = 400; + res.write(cowsay.say({text: 'bad request'})) + } }); } - if(req.method === 'GET' && req.url.pathname === '/cowsay') { + if(req.method === 'GET' && req.url.pathname === '/cowsay' || '/*') { let params = req.url.query; - console.log('querystring params:', params); - res.write(cowsay.say({text: 'HELLO!!'})); + res.statusCode = 200; + res.write(cowsay.say({text: params.text})); res.end(); } res.end(); -}); - -server.listen(PORT, function() { +}).listen(PORT, function() { console.log('Server on PORT:', PORT); }); \ No newline at end of file From e8764aa9f36318d4b90f1dbd3dcf2cf03771aa0f Mon Sep 17 00:00:00 2001 From: Loaye Date: Tue, 25 Jul 2017 17:01:50 -0700 Subject: [PATCH 06/16] finishing up --- server.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/server.js b/server.js index 7530829..642ea1a 100644 --- a/server.js +++ b/server.js @@ -25,13 +25,20 @@ const server = http.createServer(function(req, res) { }); } - if(req.method === 'GET' && req.url.pathname === '/cowsay' || '/*') { + if(req.method === 'GET' && req.url.pathname === '/cowsay') { let params = req.url.query; res.statusCode = 200; res.write(cowsay.say({text: params.text})); res.end(); } + if(req.method === 'GET' && req.url.pathname === '/') { + let params = req.url.query; + res.statusCode = 200; + res.write(cowsay.say({text: 'Hello from my server!'})); + res.end(); + } + res.end(); }).listen(PORT, function() { console.log('Server on PORT:', PORT); From a3046617ab3a67831c3d2d0b121981c3a7a5e53d Mon Sep 17 00:00:00 2001 From: Loaye Date: Tue, 25 Jul 2017 17:04:04 -0700 Subject: [PATCH 07/16] MISSING: Adds missing semicolon --- server.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server.js b/server.js index 642ea1a..4928500 100644 --- a/server.js +++ b/server.js @@ -20,7 +20,7 @@ const server = http.createServer(function(req, res) { res.write(cowsay.say({text: req.body.text})); } else { res.statusCode = 400; - res.write(cowsay.say({text: 'bad request'})) + res.write(cowsay.say({text: 'bad request'})); } }); } From eeb3a95e89e5d273621e255090ca3c20a419a901 Mon Sep 17 00:00:00 2001 From: Loaye Date: Tue, 25 Jul 2017 17:19:38 -0700 Subject: [PATCH 08/16] fixed headers --- server.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/server.js b/server.js index 4928500..0a62ac3 100644 --- a/server.js +++ b/server.js @@ -15,8 +15,7 @@ const server = http.createServer(function(req, res) { parseBody(req, function(err) { if(err) return console.error(err); if(req.body.text) { - res.statusCode = 200; - res.writeHead({'Content-Type': 'text/plain'}); + res.writeHead(200, {'Content-Type': 'text/plain'}); res.write(cowsay.say({text: req.body.text})); } else { res.statusCode = 400; @@ -34,8 +33,7 @@ const server = http.createServer(function(req, res) { if(req.method === 'GET' && req.url.pathname === '/') { let params = req.url.query; - res.statusCode = 200; - res.write(cowsay.say({text: 'Hello from my server!'})); + res.write(cowsay.say(200, {text: 'Hello from my server!'})); res.end(); } From c05c1b296a46f122e7ee575479e32eca238c997f Mon Sep 17 00:00:00 2001 From: Loaye Date: Tue, 25 Jul 2017 17:23:31 -0700 Subject: [PATCH 09/16] blah --- server.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server.js b/server.js index 0a62ac3..11f00f7 100644 --- a/server.js +++ b/server.js @@ -19,7 +19,7 @@ const server = http.createServer(function(req, res) { res.write(cowsay.say({text: req.body.text})); } else { res.statusCode = 400; - res.write(cowsay.say({text: 'bad request'})); + res.write(400, cowsay.say({text: 'bad request'})); } }); } From 573d0bed75dc299137541977f6ec1a9d8f06fe33 Mon Sep 17 00:00:00 2001 From: Loaye Date: Tue, 25 Jul 2017 17:24:57 -0700 Subject: [PATCH 10/16] Fixed cowsay pathing --- server.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/server.js b/server.js index 11f00f7..0048a0a 100644 --- a/server.js +++ b/server.js @@ -26,8 +26,15 @@ const server = http.createServer(function(req, res) { if(req.method === 'GET' && req.url.pathname === '/cowsay') { let params = req.url.query; - res.statusCode = 200; - res.write(cowsay.say({text: params.text})); + + if(params.text) { + res.writeHead(200, { 'Content-Type': 'text/plain'}); + res.write('hello from my server!'); + res.write(cowsay.say({ text: params.text })); + } else if(params.text != 'string') { + res.writeHead(400); + res.write(cowsay.say({ text: 'bad request'})); + } res.end(); } From 137cfc2f69f54ebfad49795fa51f7259b860af6a Mon Sep 17 00:00:00 2001 From: Loaye Date: Tue, 25 Jul 2017 17:40:03 -0700 Subject: [PATCH 11/16] fixed minor spellings --- server.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/server.js b/server.js index 0048a0a..83b6ced 100644 --- a/server.js +++ b/server.js @@ -28,12 +28,12 @@ const server = http.createServer(function(req, res) { let params = req.url.query; if(params.text) { - res.writeHead(200, { 'Content-Type': 'text/plain'}); + res.writeHead(200, {'Content-Type': 'text/plain'}); res.write('hello from my server!'); - res.write(cowsay.say({ text: params.text })); - } else if(params.text != 'string') { - res.writeHead(400); - res.write(cowsay.say({ text: 'bad request'})); + res.write(cowsay.say({text: params.text })); + } else(!params.text) { + res.statusCode = 400; + res.write(cowsay.say({text: 'bad request'})); } res.end(); } From 29d0580a2dec77f3aba28da80f70499b7a8bb90d Mon Sep 17 00:00:00 2001 From: Loaye Date: Tue, 25 Jul 2017 17:50:31 -0700 Subject: [PATCH 12/16] fixed spelling error --- server.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server.js b/server.js index 83b6ced..e2acfd2 100644 --- a/server.js +++ b/server.js @@ -31,7 +31,7 @@ const server = http.createServer(function(req, res) { res.writeHead(200, {'Content-Type': 'text/plain'}); res.write('hello from my server!'); res.write(cowsay.say({text: params.text })); - } else(!params.text) { + } else { res.statusCode = 400; res.write(cowsay.say({text: 'bad request'})); } From adc052bdfa92bc96e70df5750a9c4d063f5cdcf6 Mon Sep 17 00:00:00 2001 From: Loaye Date: Wed, 26 Jul 2017 13:17:33 -0700 Subject: [PATCH 13/16] fixed shit --- server.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/server.js b/server.js index e2acfd2..48dd4ee 100644 --- a/server.js +++ b/server.js @@ -16,10 +16,12 @@ const server = http.createServer(function(req, res) { if(err) return console.error(err); if(req.body.text) { res.writeHead(200, {'Content-Type': 'text/plain'}); - res.write(cowsay.say({text: req.body.text})); + res.write(cowsay.say({text: req.body.text, f: 'tux'})); + res.end(); } else { res.statusCode = 400; - res.write(400, cowsay.say({text: 'bad request'})); + res.write(400, cowsay.say({text: 'bad request', f: 'mutilated'})); + res.end(); } }); } @@ -30,17 +32,17 @@ const server = http.createServer(function(req, res) { if(params.text) { res.writeHead(200, {'Content-Type': 'text/plain'}); res.write('hello from my server!'); - res.write(cowsay.say({text: params.text })); + res.write(cowsay.say({text: params.text, f: 'tux'})); } else { res.statusCode = 400; - res.write(cowsay.say({text: 'bad request'})); + res.write(cowsay.say({text: 'bad request', f: 'mutilated'})); + res.end(); } - res.end(); } if(req.method === 'GET' && req.url.pathname === '/') { let params = req.url.query; - res.write(cowsay.say(200, {text: 'Hello from my server!'})); + res.write(cowsay.say({text: 'Hello from my server!'})); res.end(); } From 40b3c6dc4cd6bfb2c722c3252998040d8fa7b706 Mon Sep 17 00:00:00 2001 From: Loaye Date: Wed, 26 Jul 2017 13:30:53 -0700 Subject: [PATCH 14/16] minor stuff fixed --- lib/parse-body.js | 5 ++++- server.js | 13 ++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/lib/parse-body.js b/lib/parse-body.js index 0c1d1c0..8450687 100644 --- a/lib/parse-body.js +++ b/lib/parse-body.js @@ -1,13 +1,16 @@ 'use strict'; module.exports = function(req, callback) { - req.body = ''; + var tempBody = ''; req.on('data', function(data) { req.body += data.toString(); }); req.on('end', function() { + if(!tempBody) { + return callback(new Error('not shit')); + } try { req.body = JSON.parse(req.body); callback(null, req.body); diff --git a/server.js b/server.js index 48dd4ee..e8523c0 100644 --- a/server.js +++ b/server.js @@ -11,16 +11,15 @@ const server = http.createServer(function(req, res) { req.url = url.parse(req.url); req.url.query = querystring.parse(req.url.query); - if(req.method === 'POST') { + if(req.method === 'POST' && req.url.pathname === '/cowsay') parseBody(req, function(err) { - if(err) return console.error(err); - if(req.body.text) { - res.writeHead(200, {'Content-Type': 'text/plain'}); - res.write(cowsay.say({text: req.body.text, f: 'tux'})); - res.end(); - } else { + if(err) { res.statusCode = 400; res.write(400, cowsay.say({text: 'bad request', f: 'mutilated'})); + res.end() + } else { + res.writeHead(200, {'Content-Type': 'text/plain'}); + res.write(cowsay.say({text: req.body.text, f: 'tux'})); res.end(); } }); From 2d188d2bfd7c5bfa746c3b4d865f84a7530b1174 Mon Sep 17 00:00:00 2001 From: Loaye Date: Wed, 26 Jul 2017 13:50:28 -0700 Subject: [PATCH 15/16] adds starting bracket --- server.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server.js b/server.js index e8523c0..62183b9 100644 --- a/server.js +++ b/server.js @@ -11,7 +11,7 @@ const server = http.createServer(function(req, res) { req.url = url.parse(req.url); req.url.query = querystring.parse(req.url.query); - if(req.method === 'POST' && req.url.pathname === '/cowsay') + if(req.method === 'POST' && req.url.pathname === '/cowsay') { parseBody(req, function(err) { if(err) { res.statusCode = 400; From cb000570f47070f35d2a3e5dae4e404c6f9e536f Mon Sep 17 00:00:00 2001 From: Loaye Date: Wed, 26 Jul 2017 14:03:54 -0700 Subject: [PATCH 16/16] adjusted back to class example for parse-body --- lib/parse-body.js | 11 ++++------- server.js | 9 ++++----- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/lib/parse-body.js b/lib/parse-body.js index 8450687..0ed8a60 100644 --- a/lib/parse-body.js +++ b/lib/parse-body.js @@ -1,22 +1,19 @@ 'use strict'; module.exports = function(req, callback) { - var tempBody = ''; - + req.body = ''; + req.on('data', function(data) { req.body += data.toString(); }); req.on('end', function() { - if(!tempBody) { - return callback(new Error('not shit')); - } try { req.body = JSON.parse(req.body); callback(null, req.body); - } catch(err) { + } catch (err) { callback(err); - } + }; }); }; diff --git a/server.js b/server.js index 62183b9..3909d25 100644 --- a/server.js +++ b/server.js @@ -13,10 +13,11 @@ const server = http.createServer(function(req, res) { if(req.method === 'POST' && req.url.pathname === '/cowsay') { parseBody(req, function(err) { + if(err) console.error(err); if(err) { - res.statusCode = 400; - res.write(400, cowsay.say({text: 'bad request', f: 'mutilated'})); - res.end() + res.writeHead(400, {'Content-Type': 'text/plain'}); + res.write(cowsay.say({text: 'bad request', f: 'mutilated'})); + res.end(); } else { res.writeHead(200, {'Content-Type': 'text/plain'}); res.write(cowsay.say({text: req.body.text, f: 'tux'})); @@ -44,8 +45,6 @@ const server = http.createServer(function(req, res) { res.write(cowsay.say({text: 'Hello from my server!'})); res.end(); } - - res.end(); }).listen(PORT, function() { console.log('Server on PORT:', PORT); }); \ No newline at end of file